* [PATCH] drm/omapdrm: don't deref error pointer in the omap_fbdev_create error path
@ 2020-12-25 3:05 Defang Bo
0 siblings, 0 replies; 3+ messages in thread
From: Defang Bo @ 2020-12-25 3:05 UTC (permalink / raw)
To: 603571786, tomi.valkeinen, airlied, dri-devel, linux-kernel; +Cc: bodefang
From: bodefang <bodefang@126.com>
Similar to commit <789d4c300>("drm/msm: don't deref error pointer in the msm_fbdev_create error path")
the error pointer returned by omap_framebuffer_init gets passed to drm_framebuffer_remove.
The latter handles only Null pointers,thus a nasty crash will occur.
Signed-off-by: bodefang <bodefang@126.com>
---
drivers/gpu/drm/omapdrm/omap_fbdev.c | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/drivers/gpu/drm/omapdrm/omap_fbdev.c b/drivers/gpu/drm/omapdrm/omap_fbdev.c
index 3f6cfc2..372afd4 100644
--- a/drivers/gpu/drm/omapdrm/omap_fbdev.c
+++ b/drivers/gpu/drm/omapdrm/omap_fbdev.c
@@ -141,8 +141,7 @@ static int omap_fbdev_create(struct drm_fb_helper *helper,
* to unref the bo:
*/
drm_gem_object_put(fbdev->bo);
- ret = PTR_ERR(fb);
- goto fail;
+ return PTR_ERR(fb);
}
/* note: this keeps the bo pinned.. which is perhaps not ideal,
@@ -200,10 +199,7 @@ static int omap_fbdev_create(struct drm_fb_helper *helper,
fail:
- if (ret) {
- if (fb)
- drm_framebuffer_remove(fb);
- }
+ drm_framebuffer_remove(fb);
return ret;
}
--
2.7.4
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH] drm/omapdrm: don't deref error pointer in the omap_fbdev_create error path
@ 2020-12-28 2:46 ` Defang Bo
0 siblings, 0 replies; 3+ messages in thread
From: Defang Bo @ 2020-12-28 2:46 UTC (permalink / raw)
To: tomi.valkeinen, airlied, daniel; +Cc: dri-devel, linux-kernel, Defang Bo
Similar to commit<789d4c300e10>("drm/msm: don't deref error pointer in the msm_fbdev_create error path"),
the error pointer returned by omap_framebuffer_init() gets passed to drm_framebuffer_remove.
The latter handles only Null pointers,thus a nasty crash will occur.
Drop the unnecessary checks in label fail.
Signed-off-by: Defang Bo <bodefang@126.com>
---
drivers/gpu/drm/omapdrm/omap_fbdev.c | 10 ++--------
1 file changed, 2 insertions(+), 8 deletions(-)
diff --git a/drivers/gpu/drm/omapdrm/omap_fbdev.c b/drivers/gpu/drm/omapdrm/omap_fbdev.c
index 3f6cfc2..7ba07c8 100644
--- a/drivers/gpu/drm/omapdrm/omap_fbdev.c
+++ b/drivers/gpu/drm/omapdrm/omap_fbdev.c
@@ -141,8 +141,7 @@ static int omap_fbdev_create(struct drm_fb_helper *helper,
* to unref the bo:
*/
drm_gem_object_put(fbdev->bo);
- ret = PTR_ERR(fb);
- goto fail;
+ return PTR_ERR(fb);
}
/* note: this keeps the bo pinned.. which is perhaps not ideal,
@@ -199,12 +198,7 @@ static int omap_fbdev_create(struct drm_fb_helper *helper,
return 0;
fail:
-
- if (ret) {
- if (fb)
- drm_framebuffer_remove(fb);
- }
-
+ drm_framebuffer_remove(fb);
return ret;
}
--
2.7.4
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH] drm/omapdrm: don't deref error pointer in the omap_fbdev_create error path
@ 2020-12-28 2:46 ` Defang Bo
0 siblings, 0 replies; 3+ messages in thread
From: Defang Bo @ 2020-12-28 2:46 UTC (permalink / raw)
To: tomi.valkeinen, airlied, daniel; +Cc: Defang Bo, linux-kernel, dri-devel
Similar to commit<789d4c300e10>("drm/msm: don't deref error pointer in the msm_fbdev_create error path"),
the error pointer returned by omap_framebuffer_init() gets passed to drm_framebuffer_remove.
The latter handles only Null pointers,thus a nasty crash will occur.
Drop the unnecessary checks in label fail.
Signed-off-by: Defang Bo <bodefang@126.com>
---
drivers/gpu/drm/omapdrm/omap_fbdev.c | 10 ++--------
1 file changed, 2 insertions(+), 8 deletions(-)
diff --git a/drivers/gpu/drm/omapdrm/omap_fbdev.c b/drivers/gpu/drm/omapdrm/omap_fbdev.c
index 3f6cfc2..7ba07c8 100644
--- a/drivers/gpu/drm/omapdrm/omap_fbdev.c
+++ b/drivers/gpu/drm/omapdrm/omap_fbdev.c
@@ -141,8 +141,7 @@ static int omap_fbdev_create(struct drm_fb_helper *helper,
* to unref the bo:
*/
drm_gem_object_put(fbdev->bo);
- ret = PTR_ERR(fb);
- goto fail;
+ return PTR_ERR(fb);
}
/* note: this keeps the bo pinned.. which is perhaps not ideal,
@@ -199,12 +198,7 @@ static int omap_fbdev_create(struct drm_fb_helper *helper,
return 0;
fail:
-
- if (ret) {
- if (fb)
- drm_framebuffer_remove(fb);
- }
-
+ drm_framebuffer_remove(fb);
return ret;
}
--
2.7.4
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-12-28 10:20 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-12-25 3:05 [PATCH] drm/omapdrm: don't deref error pointer in the omap_fbdev_create error path Defang Bo
2020-12-28 2:46 Defang Bo
2020-12-28 2:46 ` Defang Bo
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.