diff options
| author | Dave Airlie <airlied@redhat.com> | 2019-03-12 14:52:53 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2019-03-12 14:57:14 +1000 |
| commit | 96413c78d958e1047bf1cba78b91e1c7addc58b3 (patch) | |
| tree | 7e0f76c1ba0d8f03ec46719a56c04af1dbe8c7e9 /drivers/gpu/drm/drm_ioc32.c | |
| parent | 4b057e73f28f1df13b77b77a52094238ffdf8abd (diff) | |
| parent | e552f0851070fe4975d610a99910be4e9bf5d7bd (diff) | |
| download | linux-96413c78d958e1047bf1cba78b91e1c7addc58b3.tar.gz linux-96413c78d958e1047bf1cba78b91e1c7addc58b3.tar.bz2 linux-96413c78d958e1047bf1cba78b91e1c7addc58b3.zip | |
Merge tag 'drm-misc-next-fixes-2019-03-06' of git://anongit.freedesktop.org/drm/drm-misc into drm-next
- Properly mark the ptr_to_compat argument with the __user tag
- Merge __drm_atomic_helper_disable_all into drm_atomic_helper_disable_all
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Maxime Ripard <maxime.ripard@bootlin.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190306105454.33ddidiqmsjcvxa4@flea
Diffstat (limited to 'drivers/gpu/drm/drm_ioc32.c')
| -rw-r--r-- | drivers/gpu/drm/drm_ioc32.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/drm_ioc32.c b/drivers/gpu/drm/drm_ioc32.c index 67b1fca39aa6..0e3043e08c69 100644 --- a/drivers/gpu/drm/drm_ioc32.c +++ b/drivers/gpu/drm/drm_ioc32.c @@ -185,7 +185,7 @@ static int compat_drm_getmap(struct file *file, unsigned int cmd, m32.size = map.size; m32.type = map.type; m32.flags = map.flags; - m32.handle = ptr_to_compat(map.handle); + m32.handle = ptr_to_compat((void __user *)map.handle); m32.mtrr = map.mtrr; if (copy_to_user(argp, &m32, sizeof(m32))) return -EFAULT; @@ -216,7 +216,7 @@ static int compat_drm_addmap(struct file *file, unsigned int cmd, m32.offset = map.offset; m32.mtrr = map.mtrr; - m32.handle = ptr_to_compat(map.handle); + m32.handle = ptr_to_compat((void __user *)map.handle); if (map.handle != compat_ptr(m32.handle)) pr_err_ratelimited("compat_drm_addmap truncated handle %p for type %d offset %x\n", map.handle, m32.type, m32.offset); @@ -526,7 +526,7 @@ static int compat_drm_getsareactx(struct file *file, unsigned int cmd, if (err) return err; - req32.handle = ptr_to_compat(req.handle); + req32.handle = ptr_to_compat((void __user *)req.handle); if (copy_to_user(argp, &req32, sizeof(req32))) return -EFAULT; |