From: YueHaibing <yuehaibing@huawei.com>
Date: Fri, 8 Feb 2019 18:24:49 +0000 (+0100)
Subject: video: fbdev: Fix potential NULL pointer dereference
X-Git-Tag: v5.1-rc1~20^2~2
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=f40298444e8ca13789dc002ffb269c343aadfb87;p=linux-block.git

video: fbdev: Fix potential NULL pointer dereference

There is a potential NULL pointer dereference in case
fb_create_modedb() fails and returns NULL.

Signed-off-by: YueHaibing <yuehaibing@huawei.com>
Cc: Kees Cook <keescook@chromium.org>
Cc: Rob Herring <robh@kernel.org>
Signed-off-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
---

diff --git a/drivers/video/fbdev/core/fbmon.c b/drivers/video/fbdev/core/fbmon.c
index dd3128990776..3558a70a6664 100644
--- a/drivers/video/fbdev/core/fbmon.c
+++ b/drivers/video/fbdev/core/fbmon.c
@@ -978,6 +978,8 @@ void fb_edid_to_monspecs(unsigned char *edid, struct fb_monspecs *specs)
 	get_monspecs(edid, specs);
 
 	specs->modedb = fb_create_modedb(edid, &specs->modedb_len, specs);
+	if (!specs->modedb)
+		return;
 
 	/*
 	 * Workaround for buggy EDIDs that sets that the first