[PATCH] drm/omapdrm: don't deref error pointer in the omap_fbdev_create error path

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



From: bodefang <bodefang@xxxxxxx>

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@xxxxxxx>
---
 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@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/dri-devel



[Index of Archives]     [Linux DRI Users]     [Linux Intel Graphics]     [Linux USB Devel]     [Video for Linux]     [Linux Audio Users]     [Yosemite News]     [Linux Kernel]     [Linux SCSI]     [XFree86]     [Linux USB Devel]     [Video for Linux]     [Linux Audio Users]     [Linux Kernel]     [Linux SCSI]     [XFree86]
  Powered by Linux