Commit 05865769 authored by Noralf Trønnes's avatar Noralf Trønnes

drm/fb-helper: Fix drm_fb_helper_hotplug_event() NULL ptr argument

drm_fb_helper_hotplug_event() should tolerate the fb_helper argument being
NULL. Commit 03a9606e ("drm/fb-helper: Avoid race with DRM userspace")
introduced a fb_helper dereference before the NULL check.
Fixup by moving the dereference after the NULL check.

Fixes: 03a9606e ("drm/fb-helper: Avoid race with DRM userspace")
Reported-by: default avatarkbuild test robot <lkp@intel.com>
Reported-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: default avatarNoralf Trønnes <noralf@tronnes.org>
Reviewed-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/20190515132925.48867-1-noralf@tronnes.org
parent 86d804f4
...@@ -3031,7 +3031,6 @@ EXPORT_SYMBOL(drm_fb_helper_initial_config); ...@@ -3031,7 +3031,6 @@ EXPORT_SYMBOL(drm_fb_helper_initial_config);
*/ */
int drm_fb_helper_hotplug_event(struct drm_fb_helper *fb_helper) int drm_fb_helper_hotplug_event(struct drm_fb_helper *fb_helper)
{ {
struct drm_device *dev = fb_helper->dev;
int err = 0; int err = 0;
if (!drm_fbdev_emulation || !fb_helper) if (!drm_fbdev_emulation || !fb_helper)
...@@ -3044,13 +3043,13 @@ int drm_fb_helper_hotplug_event(struct drm_fb_helper *fb_helper) ...@@ -3044,13 +3043,13 @@ int drm_fb_helper_hotplug_event(struct drm_fb_helper *fb_helper)
return err; return err;
} }
if (!fb_helper->fb || !drm_master_internal_acquire(dev)) { if (!fb_helper->fb || !drm_master_internal_acquire(fb_helper->dev)) {
fb_helper->delayed_hotplug = true; fb_helper->delayed_hotplug = true;
mutex_unlock(&fb_helper->lock); mutex_unlock(&fb_helper->lock);
return err; return err;
} }
drm_master_internal_release(dev); drm_master_internal_release(fb_helper->dev);
DRM_DEBUG_KMS("\n"); DRM_DEBUG_KMS("\n");
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment