diff options
| author | Josh Boyer <jwboyer@fedoraproject.org> | 2016-01-28 15:41:48 -0500 |
|---|---|---|
| committer | Josh Boyer <jwboyer@fedoraproject.org> | 2016-01-28 15:47:36 -0500 |
| commit | 1f1a7f551b3a3aa253646fccf37e9351f585eb16 (patch) | |
| tree | 6852569827906782f911ae0afebebb3ce58515bf | |
| parent | f760e670eeb39d7afb66f94308662bc0279984a1 (diff) | |
| download | kernel-1f1a7f551b3a3aa253646fccf37e9351f585eb16.tar.gz kernel-1f1a7f551b3a3aa253646fccf37e9351f585eb16.tar.xz kernel-1f1a7f551b3a3aa253646fccf37e9351f585eb16.zip | |
Fix issues with ivtv driver on PVR350 devices (rhbz 1278942)
| -rw-r--r-- | kernel.spec | 4 | ||||
| -rw-r--r-- | media-ivtv-avoid-going-past-input-audio-array.patch | 29 |
2 files changed, 33 insertions, 0 deletions
diff --git a/kernel.spec b/kernel.spec index bc00df04b..9567bea9a 100644 --- a/kernel.spec +++ b/kernel.spec @@ -624,6 +624,9 @@ Patch610: PNP-Add-Broadwell-to-Intel-MCH-size-workaround.patch #rhbz 1300955 Patch640: PNP-Add-Haswell-ULT-to-Intel-MCH-size-workaround.patch +#rhbz 1278942 +Patch643: media-ivtv-avoid-going-past-input-audio-array.patch + #rhbz 1302037 Patch644: wext-fix-message-delay-ordering.patch Patch645: cfg80211-wext-fix-message-ordering.patch @@ -2072,6 +2075,7 @@ fi # %changelog * Thu Jan 28 2016 Josh Boyer <jwboyer@fedoraproject.org> +- Fix issues with ivtv driver on PVR350 devices (rhbz 1278942) - Add patches to fix suprious NEWLINK netlink messages (rhbz 1302037) * Mon Jan 25 2016 Josh Boyer <jwboyer@fedoraproject.org> 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 + |