[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <2ba38b28-89a3-3ae7-6f13-af298165cfd8@redhat.com>
Date: Wed, 27 Feb 2019 15:52:43 -0800
From: Laura Abbott <labbott@...hat.com>
To: Eric Biggers <ebiggers@...nel.org>, dri-devel@...ts.freedesktop.org
Cc: Chris Wilson <chris@...is-wilson.co.uk>,
syzkaller-bugs <syzkaller-bugs@...glegroups.com>,
linux-kernel@...r.kernel.org,
syzbot+e73f2fb5ed5a5df36d33@...kaller.appspotmail.com,
Daniel Vetter <daniel.vetter@...ll.ch>, stable@...r.kernel.org
Subject: Re: [PATCH v2] drm/vgem: fix use-after-free when
drm_gem_handle_create() fails
On 2/26/19 1:44 PM, Eric Biggers wrote:
> From: Eric Biggers <ebiggers@...gle.com>
>
> If drm_gem_handle_create() fails in vgem_gem_create(), then the
> drm_vgem_gem_object is freed twice: once when the reference is dropped
> by drm_gem_object_put_unlocked(), and again by __vgem_gem_destroy().
>
> This was hit by syzkaller using fault injection.
>
> Fix it by skipping the second free.
>
> Reported-by: syzbot+e73f2fb5ed5a5df36d33@...kaller.appspotmail.com
> Fixes: af33a9190d02 ("drm/vgem: Enable dmabuf import interfaces")
> Reviewed-by: Chris Wilson <chris@...is-wilson.co.uk>
> Cc: Laura Abbott <labbott@...hat.com>
> Cc: Daniel Vetter <daniel.vetter@...ll.ch>
> Cc: stable@...r.kernel.org
> Signed-off-by: Eric Biggers <ebiggers@...gle.com>
> ---
> drivers/gpu/drm/vgem/vgem_drv.c | 6 +-----
> 1 file changed, 1 insertion(+), 5 deletions(-)
>
> diff --git a/drivers/gpu/drm/vgem/vgem_drv.c b/drivers/gpu/drm/vgem/vgem_drv.c
> index 5930facd6d2d8..11a8f99ba18c5 100644
> --- a/drivers/gpu/drm/vgem/vgem_drv.c
> +++ b/drivers/gpu/drm/vgem/vgem_drv.c
> @@ -191,13 +191,9 @@ static struct drm_gem_object *vgem_gem_create(struct drm_device *dev,
> ret = drm_gem_handle_create(file, &obj->base, handle);
> drm_gem_object_put_unlocked(&obj->base);
> if (ret)
> - goto err;
> + return ERR_PTR(ret);
>
> return &obj->base;
> -
> -err:
> - __vgem_gem_destroy(obj);
> - return ERR_PTR(ret);
> }
>
> static int vgem_gem_dumb_create(struct drm_file *file, struct drm_device *dev,
>
Acked-by: Laura Abbott <labbott@...hat.com>
Powered by blists - more mailing lists