Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2f9e682d authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

[media] cx18: avoid going past input/audio array 



As reported by smatch:
	drivers/media/pci/cx18/cx18-driver.c:807 cx18_init_struct2() error: buffer overflow 'cx->card->video_inputs' 6 <= 6

That happens because nof_inputs and nof_audio_inputs can be initialized
as CX18_CARD_MAX_VIDEO_INPUTS, instead of CX18_CARD_MAX_VIDEO_INPUTS - 1.

Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
Acked-by: default avatarAndy Walls <awalls@md.metrocast.net>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
parent 81b7d14e

drivers/media/pci/cx18/cx18-driver.c

+2 −2
Original line number Diff line number Diff line
@@ -786,11 +786,11 @@ static void cx18_init_struct2(struct cx18 *cx) 
{

	int i;



	for (i = 0; i < CX18_CARD_MAX_VIDEO_INPUTS; i++)

	for (i = 0; i < CX18_CARD_MAX_VIDEO_INPUTS - 1; i++)

		if (cx->card->video_inputs[i].video_type == 0)

			break;

	cx->nof_inputs = i;

	for (i = 0; i < CX18_CARD_MAX_AUDIO_INPUTS; i++)

	for (i = 0; i < CX18_CARD_MAX_AUDIO_INPUTS - 1; i++)

		if (cx->card->audio_inputs[i].audio_type == 0)

			break;

	cx->nof_audio_inputs = i;