Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

drm/mgag200: Fix error handling paths in fbdev driver

Set up error handling in mgag200_fbdev_init and mgag200fb_create such that
they release the things they allocate, rather than relying on someone
calling mga_fbdev_destroy.

Based on a patch by Sudip Mukherjee <sudipm.mukherjee@gmail.com>

Link: http://lkml.kernel.org/r/55F6E68D.8070800@codeaurora.org
Reported-by: Ingo Molnar <mingo@kernel.org>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: Dave Airlie <airlied@gmail.com>
Cc: David Airlie <airlied@linux.ie>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Sudip Mukherjee <sudipm.mukherjee@gmail.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: dri-devel <dri-devel@lists.freedesktop.org>
Signed-off-by: Archit Taneja <architt@codeaurora.org>
Signed-off-by: Dave Airlie <airlied@redhat.com>

authored by

Archit Taneja and committed by
Dave Airlie
aec9e129 69e5d3f8

+23 -8
+23 -8
drivers/gpu/drm/mgag200/mgag200_fb.c
··· 186 186 187 187 sysram = vmalloc(size); 188 188 if (!sysram) 189 - return -ENOMEM; 189 + goto err_sysram; 190 190 191 191 info = drm_fb_helper_alloc_fbi(helper); 192 - if (IS_ERR(info)) 193 - return PTR_ERR(info); 192 + if (IS_ERR(info)) { 193 + ret = PTR_ERR(info); 194 + goto err_alloc_fbi; 195 + } 194 196 195 197 info->par = mfbdev; 196 198 197 199 ret = mgag200_framebuffer_init(dev, &mfbdev->mfb, &mode_cmd, gobj); 198 200 if (ret) 199 - return ret; 201 + goto err_framebuffer_init; 200 202 201 203 mfbdev->sysram = sysram; 202 204 mfbdev->size = size; ··· 227 225 228 226 DRM_DEBUG_KMS("allocated %dx%d\n", 229 227 fb->width, fb->height); 228 + 230 229 return 0; 230 + 231 + err_framebuffer_init: 232 + drm_fb_helper_release_fbi(helper); 233 + err_alloc_fbi: 234 + vfree(sysram); 235 + err_sysram: 236 + drm_gem_object_unreference_unlocked(gobj); 237 + 238 + return ret; 231 239 } 232 240 233 241 static int mga_fbdev_destroy(struct drm_device *dev, ··· 288 276 ret = drm_fb_helper_init(mdev->dev, &mfbdev->helper, 289 277 mdev->num_crtc, MGAG200FB_CONN_LIMIT); 290 278 if (ret) 291 - return ret; 279 + goto err_fb_helper; 292 280 293 281 ret = drm_fb_helper_single_add_all_connectors(&mfbdev->helper); 294 282 if (ret) 295 - goto fini; 283 + goto err_fb_setup; 296 284 297 285 /* disable all the possible outputs/crtcs before entering KMS mode */ 298 286 drm_helper_disable_unused_functions(mdev->dev); 299 287 300 288 ret = drm_fb_helper_initial_config(&mfbdev->helper, bpp_sel); 301 289 if (ret) 302 - goto fini; 290 + goto err_fb_setup; 303 291 304 292 return 0; 305 293 306 - fini: 294 + err_fb_setup: 307 295 drm_fb_helper_fini(&mfbdev->helper); 296 + err_fb_helper: 297 + mdev->mfbdev = NULL; 298 + 308 299 return ret; 309 300 } 310 301