summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/drm_lock.c
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2016-11-27 17:09:09 +0000
committerDaniel Vetter <daniel.vetter@ffwll.ch>2016-11-28 08:39:41 +0100
commita2ec1c132a593ac4f05eb8d02834c4675a4aea07 (patch)
treef7b715f3efb8cde8211b6db1397a545195421dde /drivers/gpu/drm/drm_lock.c
parent75df62478c84e101e0c4141e4e6c3ed10163de1f (diff)
downloadop-kernel-dev-a2ec1c132a593ac4f05eb8d02834c4675a4aea07.zip
op-kernel-dev-a2ec1c132a593ac4f05eb8d02834c4675a4aea07.tar.gz
drm: Avoid NULL dereference for DRM_LEGACY debug message
smatch warns: drivers/gpu/drm/drm_lock.c:188 drm_legacy_lock() warn: variable dereferenced before check 'master->lock.hw_lock' (see line 177) Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> Link: http://patchwork.freedesktop.org/patch/msgid/20161127170910.29106-2-chris@chris-wilson.co.uk
Diffstat (limited to 'drivers/gpu/drm/drm_lock.c')
-rw-r--r--drivers/gpu/drm/drm_lock.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/drm_lock.c b/drivers/gpu/drm/drm_lock.c
index c901f3c..32d43f8 100644
--- a/drivers/gpu/drm/drm_lock.c
+++ b/drivers/gpu/drm/drm_lock.c
@@ -176,7 +176,8 @@ int drm_legacy_lock(struct drm_device *dev, void *data,
DRM_DEBUG("%d (pid %d) requests lock (0x%08x), flags = 0x%08x\n",
lock->context, task_pid_nr(current),
- master->lock.hw_lock->lock, lock->flags);
+ master->lock.hw_lock ? master->lock.hw_lock->lock : -1,
+ lock->flags);
add_wait_queue(&master->lock.lock_queue, &entry);
spin_lock_bh(&master->lock.spinlock);
OpenPOWER on IntegriCloud