Skip to content

Commit c336a5e

Browse files
desmondcheongzxdanvet
authored andcommitted
drm: Lock pointer access in drm_master_release()
This patch eliminates the following smatch warning: drivers/gpu/drm/drm_auth.c:320 drm_master_release() warn: unlocked access 'master' (line 318) expected lock '&dev->master_mutex' The 'file_priv->master' field should be protected by the mutex lock to '&dev->master_mutex'. This is because other processes can concurrently modify this field and free the current 'file_priv->master' pointer. This could result in a use-after-free error when 'master' is dereferenced in subsequent function calls to 'drm_legacy_lock_master_cleanup()' or to 'drm_lease_revoke()'. An example of a scenario that would produce this error can be seen from a similar bug in 'drm_getunique()' that was reported by Syzbot: https://syzkaller.appspot.com/bug?id=148d2f1dfac64af52ffd27b661981a540724f803 In the Syzbot report, another process concurrently acquired the device's master mutex in 'drm_setmaster_ioctl()', then overwrote 'fpriv->master' in 'drm_new_set_master()'. The old value of 'fpriv->master' was subsequently freed before the mutex was unlocked. Reported-by: Dan Carpenter <[email protected]> Signed-off-by: Desmond Cheong Zhi Xi <[email protected]> Cc: [email protected] Signed-off-by: Daniel Vetter <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
1 parent c8a5704 commit c336a5e

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

drivers/gpu/drm/drm_auth.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -314,9 +314,10 @@ int drm_master_open(struct drm_file *file_priv)
314314
void drm_master_release(struct drm_file *file_priv)
315315
{
316316
struct drm_device *dev = file_priv->minor->dev;
317-
struct drm_master *master = file_priv->master;
317+
struct drm_master *master;
318318

319319
mutex_lock(&dev->master_mutex);
320+
master = file_priv->master;
320321
if (file_priv->magic)
321322
idr_remove(&file_priv->master->magic_map, file_priv->magic);
322323

0 commit comments

Comments
 (0)