From: Eric Biggers <ebiggers@kernel.org>
To: dri-devel@lists.freedesktop.org, David Airlie <airlied@linux.ie>,
Daniel Vetter <daniel@ffwll.ch>
Cc: Chris Wilson <chris@chris-wilson.co.uk>,
syzkaller-bugs <syzkaller-bugs@googlegroups.com>,
linux-kernel@vger.kernel.org
Subject: [PATCH] drm/vgem: fix use-after-free when drm_gem_handle_create() fails
Date: Tue, 26 Feb 2019 12:47:26 -0800 [thread overview]
Message-ID: <20190226204726.92256-1-ebiggers@kernel.org> (raw)
In-Reply-To: <CACT4Y+bnxrCTD=s9X6+JdjkV_gS=qZ99WhJsWypP88af3HzMhw@mail.gmail.com>
From: Eric Biggers <ebiggers@google.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@syzkaller.appspotmail.com
Fixes: 5ba6c9ff961a ("drm/vgem: Fix mmaping")
Cc: stable@vger.kernel.org
Signed-off-by: Eric Biggers <ebiggers@google.com>
---
drivers/gpu/drm/vgem/vgem_drv.c | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/drivers/gpu/drm/vgem/vgem_drv.c b/drivers/gpu/drm/vgem/vgem_drv.c
index 5930facd6d2d8..70646d9da1596 100644
--- a/drivers/gpu/drm/vgem/vgem_drv.c
+++ b/drivers/gpu/drm/vgem/vgem_drv.c
@@ -189,15 +189,13 @@ static struct drm_gem_object *vgem_gem_create(struct drm_device *dev,
return ERR_CAST(obj);
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,
--
2.21.0.rc2.261.ga7da99ff1b-goog
next prev parent reply other threads:[~2019-02-26 20:47 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-10-25 19:18 KASAN: use-after-free Read in drm_gem_object_release syzbot
2018-10-29 11:51 ` Dmitry Vyukov
2019-02-26 20:47 ` Eric Biggers [this message]
2019-02-26 21:01 ` [PATCH] drm/vgem: fix use-after-free when drm_gem_handle_create() fails Chris Wilson
2019-02-26 21:30 ` Eric Biggers
2019-02-26 21:44 ` [PATCH v2] " Eric Biggers
2019-02-27 23:52 ` Laura Abbott
2019-03-04 23:24 ` Rodrigo Siqueira
2019-02-26 22:08 ` [PATCH] drm/vkms: " Eric Biggers
2019-02-26 22:14 ` Chris Wilson
2019-02-27 23:12 ` Rodrigo Siqueira
2019-02-28 6:41 ` Dmitry Vyukov
2019-03-04 23:23 ` Rodrigo Siqueira
2019-03-05 14:25 ` Dmitry Vyukov
2019-03-10 15:36 ` Rodrigo Siqueira
2019-02-27 13:23 ` [PATCH] drm/vgem: " Sasha Levin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190226204726.92256-1-ebiggers@kernel.org \
--to=ebiggers@kernel.org \
--cc=airlied@linux.ie \
--cc=chris@chris-wilson.co.uk \
--cc=daniel@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=linux-kernel@vger.kernel.org \
--cc=syzkaller-bugs@googlegroups.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.