Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]


Groups > linux.kernel > #1561464 > unrolled thread

[PATCH v1] video : fbdev : stifb :- Handle return NULL error from ioremap_nocache.

Started byArvind Yadav <arvind.yadav.cs@gmail.com>
First post2017-01-18 11:40 +0100
Last post2017-01-30 17:10 +0100
Articles 2 — 2 participants

Back to article view | Back to linux.kernel


Contents

  [PATCH v1] video : fbdev : stifb :- Handle return NULL error from ioremap_nocache. Arvind Yadav <arvind.yadav.cs@gmail.com> - 2017-01-18 11:40 +0100
    Re: [PATCH v1] video : fbdev : stifb :- Handle return NULL error from  ioremap_nocache. Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com> - 2017-01-30 17:10 +0100

#1561464 — [PATCH v1] video : fbdev : stifb :- Handle return NULL error from ioremap_nocache.

FromArvind Yadav <arvind.yadav.cs@gmail.com>
Date2017-01-18 11:40 +0100
Subject[PATCH v1] video : fbdev : stifb :- Handle return NULL error from ioremap_nocache.
Message-ID<t0VON-2O5-11@gated-at.bofh.it>
Here, If ioremap_nocache will fail. It will return NULL.
Kernel can run into a NULL-pointer dereference.
This error check will avoid NULL pointer dereference.

Signed-off-by: Arvind Yadav <arvind.yadav.cs@gmail.com>
---
 drivers/video/fbdev/stifb.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/drivers/video/fbdev/stifb.c b/drivers/video/fbdev/stifb.c
index accfef7..d5deab3 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;
-- 
1.9.1

[toc] | [next] | [standalone]


#1569867 — Re: [PATCH v1] video : fbdev : stifb :- Handle return NULL error from ioremap_nocache.

FromBartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Date2017-01-30 17:10 +0100
SubjectRe: [PATCH v1] video : fbdev : stifb :- Handle return NULL error from ioremap_nocache.
Message-ID<t5mGK-64M-3@gated-at.bofh.it>
In reply to#1561464
Hi,

On Wednesday, January 18, 2017 03:51:51 PM Arvind Yadav wrote:
> Here, If ioremap_nocache will fail. It will return NULL.
> Kernel can run into a NULL-pointer dereference.
> This error check will avoid NULL pointer dereference.
> 
> Signed-off-by: Arvind Yadav <arvind.yadav.cs@gmail.com>

Thanks, I queued your patch with some minor changes for 4.11
(you can see the final version of the patch below).

Best regards,
--
Bartlomiej Zolnierkiewicz
Samsung R&D Institute Poland
Samsung Electronics


From: Arvind Yadav <arvind.yadav.cs@gmail.com>
Subject: [PATCH v1] 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" <jejb@parisc-linux.org>
Cc: Helge Deller <deller@gmx.de>
Signed-off-by: Arvind Yadav <arvind.yadav.cs@gmail.com>
[b.zolnierkie: minor fixes]
Signed-off-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
---
 drivers/video/fbdev/stifb.c |    4 ++++
 1 file changed, 4 insertions(+)

Index: b/drivers/video/fbdev/stifb.c
===================================================================
--- a/drivers/video/fbdev/stifb.c	2017-01-30 16:55:15.766435453 +0100
+++ b/drivers/video/fbdev/stifb.c	2017-01-30 16:55:15.750435453 +0100
@@ -1294,6 +1294,10 @@ static int __init stifb_init_fb(struct s
 	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;

[toc] | [prev] | [standalone]


Back to top | Article view | linux.kernel


csiph-web