diff options
| author | Dave Airlie <airlied@redhat.com> | 2019-07-04 03:17:44 +0200 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2019-07-04 03:17:48 +0200 |
| commit | a956c56b6ad3c2812cf6158eaa579c4f4012e7ab (patch) | |
| tree | cd5840e020118af0f3f19ff562a26a3b82d49705 | |
| parent | Merge tag 'drm-fixes-5.2-2019-07-02' of git://people.freedesktop.org/~agd5f/l... (diff) | |
| parent | drm/panfrost: Fix a double-free error (diff) | |
| download | linux-a956c56b6ad3c2812cf6158eaa579c4f4012e7ab.tar.xz linux-a956c56b6ad3c2812cf6158eaa579c4f4012e7ab.zip | |
Merge tag 'drm-misc-fixes-2019-07-03' of git://anongit.freedesktop.org/drm/drm-misc into drm-fixes
panfrost- Avoid double free by deleting GEM handle in create_bo failure
path (Boris)
Cc: Boris Brezillon <boris.brezillon@collabora.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Sean Paul <sean@poorly.run>
Link: https://patchwork.freedesktop.org/patch/msgid/20190704001302.GA260390@art_vandelay
| -rw-r--r-- | drivers/gpu/drm/panfrost/panfrost_drv.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/panfrost/panfrost_drv.c b/drivers/gpu/drm/panfrost/panfrost_drv.c index d11e2281dde6..7e43b25785f7 100644 --- a/drivers/gpu/drm/panfrost/panfrost_drv.c +++ b/drivers/gpu/drm/panfrost/panfrost_drv.c @@ -63,7 +63,7 @@ static int panfrost_ioctl_create_bo(struct drm_device *dev, void *data, return 0; err_free: - drm_gem_object_put_unlocked(&shmem->base); + drm_gem_handle_delete(file, args->handle); return ret; } |