iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

drm/panfrost: Fix GEM handle creation ref-counting

Browse Source 
panfrost_gem_create_with_handle() previously returned a BO but with the
only reference being from the handle, which user space could in theory
guess and release, causing a use-after-free. Additionally if the call to
panfrost_gem_mapping_get() in panfrost_ioctl_create_bo() failed then
a(nother) reference on the BO was dropped.

The _create_with_handle() is a problematic pattern, so ditch it and
instead create the handle in panfrost_ioctl_create_bo(). If the call to
panfrost_gem_mapping_get() fails then this means that user space has
indeed gone behind our back and freed the handle. In which case just
return an error code.

Reported-by: Rob Clark <robdclark@chromium.org>
Fixes: f3ba91228e8e ("drm/panfrost: Add initial panfrost driver")
Signed-off-by: Steven Price <steven.price@arm.com>
Reviewed-by: Rob Clark <robdclark@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20221219140130.410578-1-steven.price@arm.com
This commit is contained in:
Steven Price 2022-12-19 14:01:30 +00:00
parent 4e699e34f9
commit 4217c6ac81
3 changed files with 20 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
drivers/gpu/drm/panfrost/panfrost_drv.c
View File

@ -82,6 +82,7 @@ static int panfrost_ioctl_create_bo(struct drm_device *dev, void *data,
struct panfrost_gem_object *bo; struct panfrost_gem_object *bo;
struct drm_panfrost_create_bo *args = data; struct drm_panfrost_create_bo *args = data;
struct panfrost_gem_mapping *mapping; struct panfrost_gem_mapping *mapping;
int ret;
if (!args->size || args->pad || if (!args->size || args->pad ||
(args->flags & ~(PANFROST_BO_NOEXEC | PANFROST_BO_HEAP))) (args->flags & ~(PANFROST_BO_NOEXEC | PANFROST_BO_HEAP)))
@ -92,21 +93,29 @@ static int panfrost_ioctl_create_bo(struct drm_device *dev, void *data,
!(args->flags & PANFROST_BO_NOEXEC)) !(args->flags & PANFROST_BO_NOEXEC))
return -EINVAL; return -EINVAL;
bo = panfrost_gem_create_with_handle(file, dev, args->size, args->flags, bo = panfrost_gem_create(dev, args->size, args->flags);
&args->handle);
if (IS_ERR(bo)) if (IS_ERR(bo))
return PTR_ERR(bo); return PTR_ERR(bo);
ret = drm_gem_handle_create(file, &bo->base.base, &args->handle);
if (ret)
goto out;
mapping = panfrost_gem_mapping_get(bo, priv); mapping = panfrost_gem_mapping_get(bo, priv);
if (!mapping) { if (mapping) {
drm_gem_object_put(&bo->base.base); args->offset = mapping->mmnode.start << PAGE_SHIFT;
return -EINVAL; panfrost_gem_mapping_put(mapping);
} else {
/* This can only happen if the handle from
* drm_gem_handle_create() has already been guessed and freed
* by user space
*/
ret = -EINVAL;
} }
args->offset = mapping->mmnode.start << PAGE_SHIFT; out:
panfrost_gem_mapping_put(mapping); drm_gem_object_put(&bo->base.base);
return ret;
return 0;
} }
/** /**

16
drivers/gpu/drm/panfrost/panfrost_gem.c
View File

@ -235,12 +235,8 @@ struct drm_gem_object *panfrost_gem_create_object(struct drm_device *dev, size_t
} }
struct panfrost_gem_object * struct panfrost_gem_object *
panfrost_gem_create_with_handle(struct drm_file *file_priv, panfrost_gem_create(struct drm_device *dev, size_t size, u32 flags)
struct drm_device *dev, size_t size,
u32 flags,
uint32_t *handle)
{ {
int ret;
struct drm_gem_shmem_object *shmem; struct drm_gem_shmem_object *shmem;
struct panfrost_gem_object *bo; struct panfrost_gem_object *bo;
@ -256,16 +252,6 @@ panfrost_gem_create_with_handle(struct drm_file *file_priv,
bo->noexec = !!(flags & PANFROST_BO_NOEXEC); bo->noexec = !!(flags & PANFROST_BO_NOEXEC);
bo->is_heap = !!(flags & PANFROST_BO_HEAP); bo->is_heap = !!(flags & PANFROST_BO_HEAP);
/*
* Allocate an id of idr table where the obj is registered
* and handle has the id what user can see.
*/
ret = drm_gem_handle_create(file_priv, &shmem->base, handle);
/* drop reference from allocate - handle holds it now. */
drm_gem_object_put(&shmem->base);
if (ret)
return ERR_PTR(ret);
return bo; return bo;
} }

5
drivers/gpu/drm/panfrost/panfrost_gem.h
View File

@ -69,10 +69,7 @@ panfrost_gem_prime_import_sg_table(struct drm_device *dev,
struct sg_table *sgt); struct sg_table *sgt);
struct panfrost_gem_object * struct panfrost_gem_object *
panfrost_gem_create_with_handle(struct drm_file *file_priv, panfrost_gem_create(struct drm_device *dev, size_t size, u32 flags);
struct drm_device *dev, size_t size,
u32 flags,
uint32_t *handle);
int panfrost_gem_open(struct drm_gem_object *obj, struct drm_file *file_priv); int panfrost_gem_open(struct drm_gem_object *obj, struct drm_file *file_priv);
void panfrost_gem_close(struct drm_gem_object *obj, void panfrost_gem_close(struct drm_gem_object *obj,