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

Commit d746b40c authored by Sudip Mukherjee's avatar Sudip Mukherjee Committed by Tomi Valkeinen
Browse files

video: fbdev: fix possible null dereference 



we were dereferencing edid first and the NULL check was after
accessing that. now we are using edid only if we know that
it is not NULL.

Signed-off-by: default avatarSudip Mukherjee <sudip@vectorindia.org>
Signed-off-by: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
parent 11f09e53

drivers/video/fbdev/core/fbmon.c

+3 −3
Original line number Diff line number Diff line
@@ -624,9 +624,6 @@ static struct fb_videomode *fb_create_modedb(unsigned char *edid, int *dbsize, 
	int num = 0, i, first = 1;

	int ver, rev;



	ver = edid[EDID_STRUCT_VERSION];

	rev = edid[EDID_STRUCT_REVISION];



	mode = kzalloc(50 * sizeof(struct fb_videomode), GFP_KERNEL);

	if (mode == NULL)

		return NULL;
@@ -637,6 +634,9 @@ static struct fb_videomode *fb_create_modedb(unsigned char *edid, int *dbsize, 
		return NULL;

	}



	ver = edid[EDID_STRUCT_VERSION];

	rev = edid[EDID_STRUCT_REVISION];



	*dbsize = 0;



	DPRINTK("   Detailed Timings\n");