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

Commit fd02db9d authored by Dan Rosenberg's avatar Dan Rosenberg Committed by Linus Torvalds
Browse files

drivers/video/sis/sis_main.c: prevent reading uninitialized stack memory 



The FBIOGET_VBLANK device ioctl allows unprivileged users to read 16 bytes
of uninitialized stack memory, because the "reserved" member of the
fb_vblank struct declared on the stack is not altered or zeroed before
being copied back to the user.  This patch takes care of it.

Signed-off-by: default avatarDan Rosenberg <dan.j.rosenberg@gmail.com>
Cc: Thomas Winischhofer <thomas@winischhofer.net>
Cc: <stable@kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent cb1dcc0f

drivers/video/sis/sis_main.c

+3 −0
Original line number Diff line number Diff line
@@ -1701,6 +1701,9 @@ static int sisfb_ioctl(struct fb_info *info, unsigned int cmd, 
		break;



	   case FBIOGET_VBLANK:



		memset(&sisvbblank, 0, sizeof(struct fb_vblank));



		sisvbblank.count = 0;

		sisvbblank.flags = sisfb_setupvbblankflags(ivideo, &sisvbblank.vcount, &sisvbblank.hcount);