summaryrefslogtreecommitdiffstats
path: root/media-ivtv-avoid-going-past-input-audio-array.patch
diff options
context:
space:
mode:
Diffstat (limited to 'media-ivtv-avoid-going-past-input-audio-array.patch')
-rw-r--r--media-ivtv-avoid-going-past-input-audio-array.patch29
1 files changed, 29 insertions, 0 deletions
diff --git a/media-ivtv-avoid-going-past-input-audio-array.patch b/media-ivtv-avoid-going-past-input-audio-array.patch
new file mode 100644
index 000000000..42009eb71
--- /dev/null
+++ b/media-ivtv-avoid-going-past-input-audio-array.patch
@@ -0,0 +1,29 @@
+From d55ebd07b6c21a1c7e3e74f1b73b3b033cece2b5 Mon Sep 17 00:00:00 2001
+From: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
+Date: Wed, 11 Nov 2015 09:27:42 -0200
+Subject: [PATCH] [media] ivtv: avoid going past input/audio array
+
+As reported by smatch:
+ drivers/media/pci/ivtv/ivtv-driver.c:832 ivtv_init_struct2() error: buffer overflow 'itv->card->video_inputs' 6 <= 6
+
+Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
+---
+ drivers/media/pci/ivtv/ivtv-driver.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/drivers/media/pci/ivtv/ivtv-driver.c b/drivers/media/pci/ivtv/ivtv-driver.c
+index c2e60b4f292d..2bb10cd9ecfd 100644
+--- a/drivers/media/pci/ivtv/ivtv-driver.c
++++ b/drivers/media/pci/ivtv/ivtv-driver.c
+@@ -826,7 +826,7 @@ static void ivtv_init_struct2(struct ivtv *itv)
+ IVTV_CARD_INPUT_VID_TUNER)
+ break;
+ }
+- if (i == itv->nof_inputs)
++ if (i >= itv->nof_inputs)
+ i = 0;
+ itv->active_input = i;
+ itv->audio_input = itv->card->video_inputs[i].audio_index;
+--
+2.5.0
+