Commit 09290cc8 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab

[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

That happens because nof_inputs and nof_audio_inputs can be initialized
as IVTV_CARD_MAX_VIDEO_INPUTS, instead of IVTV_CARD_MAX_VIDEO_INPUTS - 1.
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
parent 1cb3b795
...@@ -805,11 +805,11 @@ static void ivtv_init_struct2(struct ivtv *itv) ...@@ -805,11 +805,11 @@ static void ivtv_init_struct2(struct ivtv *itv)
{ {
int i; int i;
for (i = 0; i < IVTV_CARD_MAX_VIDEO_INPUTS; i++) for (i = 0; i < IVTV_CARD_MAX_VIDEO_INPUTS - 1; i++)
if (itv->card->video_inputs[i].video_type == 0) if (itv->card->video_inputs[i].video_type == 0)
break; break;
itv->nof_inputs = i; itv->nof_inputs = i;
for (i = 0; i < IVTV_CARD_MAX_AUDIO_INPUTS; i++) for (i = 0; i < IVTV_CARD_MAX_AUDIO_INPUTS - 1; i++)
if (itv->card->audio_inputs[i].audio_type == 0) if (itv->card->audio_inputs[i].audio_type == 0)
break; break;
itv->nof_audio_inputs = i; itv->nof_audio_inputs = i;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment