| From 25a14438fdd4fbb4ac37aa9b7d738409fd8c5331 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Fri, 20 Mar 2020 16:23:34 +0300 |
| Subject: drm/gem: Fix a leak in drm_gem_objects_lookup() |
| |
| From: Dan Carpenter <dan.carpenter@oracle.com> |
| |
| [ Upstream commit ec0bb482de0ad5e4aba2a4537ea53eaeb77d11a6 ] |
| |
| If the "handles" allocation or the copy_from_user() fails then we leak |
| "objs". It's supposed to be freed in panfrost_job_cleanup(). |
| |
| Fixes: c117aa4d8701 ("drm: Add a drm_gem_objects_lookup helper") |
| Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> |
| Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com> |
| Link: https://patchwork.freedesktop.org/patch/msgid/20200320132334.GC95012@mwanda |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/gpu/drm/drm_gem.c | 4 ++-- |
| 1 file changed, 2 insertions(+), 2 deletions(-) |
| |
| diff --git a/drivers/gpu/drm/drm_gem.c b/drivers/gpu/drm/drm_gem.c |
| index 3087aa710e8da..d847540e4f8c3 100644 |
| --- a/drivers/gpu/drm/drm_gem.c |
| +++ b/drivers/gpu/drm/drm_gem.c |
| @@ -710,6 +710,8 @@ int drm_gem_objects_lookup(struct drm_file *filp, void __user *bo_handles, |
| if (!objs) |
| return -ENOMEM; |
| |
| + *objs_out = objs; |
| + |
| handles = kvmalloc_array(count, sizeof(u32), GFP_KERNEL); |
| if (!handles) { |
| ret = -ENOMEM; |
| @@ -723,8 +725,6 @@ int drm_gem_objects_lookup(struct drm_file *filp, void __user *bo_handles, |
| } |
| |
| ret = objects_lookup(filp, handles, count, objs); |
| - *objs_out = objs; |
| - |
| out: |
| kvfree(handles); |
| return ret; |
| -- |
| 2.25.1 |
| |
