From 74a2b96e61d78051c70c24ad4499e0c8dcd1a0f1 Mon Sep 17 00:00:00 2001 From: Arvind Yadav Date: Mon, 30 Jan 2017 17:39:49 +0100 Subject: video: fbdev: stifb: handle NULL return value from ioremap_nocache Add missing error check for ioremap_nocache() failure (prevents NULL pointer dereference on error). Cc: "James E.J. Bottomley" Cc: Helge Deller Signed-off-by: Arvind Yadav [b.zolnierkie: minor fixes] Signed-off-by: Bartlomiej Zolnierkiewicz --- drivers/video/fbdev/stifb.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'drivers/video/fbdev/stifb.c') diff --git a/drivers/video/fbdev/stifb.c b/drivers/video/fbdev/stifb.c index accfef71e984..6ded5c198998 100644 --- a/drivers/video/fbdev/stifb.c +++ b/drivers/video/fbdev/stifb.c @@ -1294,6 +1294,10 @@ static int __init stifb_init_fb(struct sti_struct *sti, int bpp_pref) strcpy(fix->id, "stifb"); info->fbops = &stifb_ops; info->screen_base = ioremap_nocache(REGION_BASE(fb,1), fix->smem_len); + if (!info->screen_base) { + printk(KERN_ERR "stifb: failed to map memory\n"); + goto out_err0; + } info->screen_size = fix->smem_len; info->flags = FBINFO_DEFAULT | FBINFO_HWACCEL_COPYAREA; info->pseudo_palette = &fb->pseudo_palette; -- cgit v1.2.3