On April 28, 2015 11:43:47 AM EDT, Mauro Carvalho Chehab <[email protected]> wrote: >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: Mauro Carvalho Chehab <[email protected]> > >diff --git a/drivers/media/pci/ivtv/ivtv-driver.c >b/drivers/media/pci/ivtv/ivtv-driver.c >index c2e60b4f292d..8616fa8193bc 100644 >--- a/drivers/media/pci/ivtv/ivtv-driver.c >+++ b/drivers/media/pci/ivtv/ivtv-driver.c >@@ -805,11 +805,11 @@ static void ivtv_init_struct2(struct ivtv *itv) > { > 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) > break; > 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) > break; > itv->nof_audio_inputs = i;
Acked-by: Andy Walls <[email protected]> -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
