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

Commit f7a595e9 authored by Roel Kluin's avatar Roel Kluin Committed by Linus Torvalds
Browse files

drivers/video/console/newport_con.c: fix read outside array bounds 



It reads linetable[] before checking bounds of index, and ARRAY_SIZE is
required because linetable[] are unsigned shorts.

Signed-off-by: default avatarRoel Kluin <roel.kluin@gmail.com>
Cc: Ralf Baechle <ralf@linux-mips.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent db8df7b0

drivers/video/console/newport_con.c

+1 −1
Original line number Diff line number Diff line
@@ -216,7 +216,7 @@ static void newport_get_screensize(void) 
	}



	newport_xsize = newport_ysize = 0;

	for (i = 0; linetable[i + 1] && (i < sizeof(linetable)); i += 2) {

	for (i = 0; i < ARRAY_SIZE(linetable) - 1 && linetable[i + 1]; i += 2) {

		cols = 0;

		newport_vc2_set(npregs, VC2_IREG_RADDR, linetable[i]);

		npregs->set.dcbmode = (NPORT_DMODE_AVC2 | VC2_REGADDR_RAM |