Skip to content

Commit b436acd

Browse files
desmondcheongzxdanvet
authored andcommitted
drm: Fix use-after-free read in drm_getunique()
There is a time-of-check-to-time-of-use error in drm_getunique() due to retrieving file_priv->master prior to locking the device's master mutex. An example can be seen in the crash report of the use-after-free error found by Syzbot: https://syzkaller.appspot.com/bug?id=148d2f1dfac64af52ffd27b661981a540724f803 In the report, the master pointer was used after being freed. This is because another process had 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. To fix this, we lock the device's master mutex before retrieving the pointer from from fpriv->master. This patch passes the Syzbot reproducer test. Reported-by: [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 8a11e84 commit b436acd

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

drivers/gpu/drm/drm_ioctl.c

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -118,17 +118,18 @@ int drm_getunique(struct drm_device *dev, void *data,
118118
struct drm_file *file_priv)
119119
{
120120
struct drm_unique *u = data;
121-
struct drm_master *master = file_priv->master;
121+
struct drm_master *master;
122122

123-
mutex_lock(&master->dev->master_mutex);
123+
mutex_lock(&dev->master_mutex);
124+
master = file_priv->master;
124125
if (u->unique_len >= master->unique_len) {
125126
if (copy_to_user(u->unique, master->unique, master->unique_len)) {
126-
mutex_unlock(&master->dev->master_mutex);
127+
mutex_unlock(&dev->master_mutex);
127128
return -EFAULT;
128129
}
129130
}
130131
u->unique_len = master->unique_len;
131-
mutex_unlock(&master->dev->master_mutex);
132+
mutex_unlock(&dev->master_mutex);
132133

133134
return 0;
134135
}

0 commit comments

Comments
 (0)