[patch] drm: potential NULL dereference with debugging enabled

Dan Carpenter dan.carpenter at oracle.com
Thu Oct 25 23:59:09 PDT 2012


We check whether this pointer is NULL a few lines later in the function
so probably we should check here too.

Signed-off-by: Dan Carpenter <dan.carpenter at oracle.com>
---
This is a static checker fix.

diff --git a/drivers/gpu/drm/drm_lock.c b/drivers/gpu/drm/drm_lock.c
index d752c96..036253e 100644
--- a/drivers/gpu/drm/drm_lock.c
+++ b/drivers/gpu/drm/drm_lock.c
@@ -68,7 +68,8 @@ int drm_lock(struct drm_device *dev, void *data, struct drm_file *file_priv)
 
 	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);


More information about the dri-devel mailing list