Commit 0ea2ea42 authored by Ezequiel Garcia's avatar Ezequiel Garcia Committed by Rodrigo Siqueira

drm/vkms: Hold gem object while still in-use

We need to keep the reference to the drm_gem_object
until the last access by vkms_dumb_create.

Therefore, the put the object after it is used.

This fixes a use-after-free issue reported by syzbot.

While here, change vkms_gem_create() symbol to static.

Reported-and-tested-by: syzbot+e3372a2afe1e7ef04bc7@syzkaller.appspotmail.com
Signed-off-by: default avatarEzequiel Garcia <ezequiel@collabora.com>
Reviewed-by: default avatarRodrigo Siqueira <Rodrigo.Siqueira@amd.com>
Signed-off-by: default avatarRodrigo Siqueira <rodrigosiqueiramelo@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200427214405.13069-1-ezequiel@collabora.com
parent c27f0cc4
...@@ -117,11 +117,6 @@ struct drm_plane *vkms_plane_init(struct vkms_device *vkmsdev, ...@@ -117,11 +117,6 @@ struct drm_plane *vkms_plane_init(struct vkms_device *vkmsdev,
enum drm_plane_type type, int index); enum drm_plane_type type, int index);
/* Gem stuff */ /* Gem stuff */
struct drm_gem_object *vkms_gem_create(struct drm_device *dev,
struct drm_file *file,
u32 *handle,
u64 size);
vm_fault_t vkms_gem_fault(struct vm_fault *vmf); vm_fault_t vkms_gem_fault(struct vm_fault *vmf);
int vkms_dumb_create(struct drm_file *file, struct drm_device *dev, int vkms_dumb_create(struct drm_file *file, struct drm_device *dev,
......
...@@ -97,10 +97,10 @@ vm_fault_t vkms_gem_fault(struct vm_fault *vmf) ...@@ -97,10 +97,10 @@ vm_fault_t vkms_gem_fault(struct vm_fault *vmf)
return ret; return ret;
} }
struct drm_gem_object *vkms_gem_create(struct drm_device *dev, static struct drm_gem_object *vkms_gem_create(struct drm_device *dev,
struct drm_file *file, struct drm_file *file,
u32 *handle, u32 *handle,
u64 size) u64 size)
{ {
struct vkms_gem_object *obj; struct vkms_gem_object *obj;
int ret; int ret;
...@@ -113,7 +113,6 @@ struct drm_gem_object *vkms_gem_create(struct drm_device *dev, ...@@ -113,7 +113,6 @@ struct drm_gem_object *vkms_gem_create(struct drm_device *dev,
return ERR_CAST(obj); return ERR_CAST(obj);
ret = drm_gem_handle_create(file, &obj->gem, handle); ret = drm_gem_handle_create(file, &obj->gem, handle);
drm_gem_object_put_unlocked(&obj->gem);
if (ret) if (ret)
return ERR_PTR(ret); return ERR_PTR(ret);
...@@ -142,6 +141,8 @@ int vkms_dumb_create(struct drm_file *file, struct drm_device *dev, ...@@ -142,6 +141,8 @@ int vkms_dumb_create(struct drm_file *file, struct drm_device *dev,
args->size = gem_obj->size; args->size = gem_obj->size;
args->pitch = pitch; args->pitch = pitch;
drm_gem_object_put_unlocked(gem_obj);
DRM_DEBUG_DRIVER("Created object of size %lld\n", size); DRM_DEBUG_DRIVER("Created object of size %lld\n", size);
return 0; return 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment