From: Rodrigo Siqueira <rodrigosiqueiramelo@gmail.com>
To: Eric Biggers <ebiggers@kernel.org>
Cc: dri-devel@lists.freedesktop.org,
syzkaller-bugs <syzkaller-bugs@googlegroups.com>,
linux-kernel@vger.kernel.org,
Haneen Mohammed <hamohammed.sa@gmail.com>,
Daniel Vetter <daniel.vetter@ffwll.ch>,
Chris Wilson <chris@chris-wilson.co.uk>,
stable@vger.kernel.org
Subject: Re: [PATCH] drm/vkms: fix use-after-free when drm_gem_handle_create() fails
Date: Wed, 27 Feb 2019 20:12:02 -0300 [thread overview]
Message-ID: <20190227231202.tycdbcqtk5ylwp4k@smtp.gmail.com> (raw)
In-Reply-To: <20190226220858.214438-1-ebiggers@kernel.org>
[-- Attachment #1: Type: text/plain, Size: 1920 bytes --]
On 02/26, Eric Biggers wrote:
> From: Eric Biggers <ebiggers@google.com>
>
> If drm_gem_handle_create() fails in vkms_gem_create(), then the
> vkms_gem_object is freed twice: once when the reference is dropped by
> drm_gem_object_put_unlocked(), and again by the extra calls to
> drm_gem_object_release() and kfree().
>
> Fix it by skipping the second release and free.
>
> This bug was originally found in the vgem driver by syzkaller using
> fault injection, but I noticed it's also present in the vkms driver.
>
> Fixes: 559e50fd34d1 ("drm/vkms: Add dumb operations")
> Cc: Rodrigo Siqueira <rodrigosiqueiramelo@gmail.com>
> Cc: Haneen Mohammed <hamohammed.sa@gmail.com>
> Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
> Cc: Chris Wilson <chris@chris-wilson.co.uk>
> Cc: stable@vger.kernel.org
> Signed-off-by: Eric Biggers <ebiggers@google.com>
> ---
> drivers/gpu/drm/vkms/vkms_gem.c | 5 +----
> 1 file changed, 1 insertion(+), 4 deletions(-)
>
> diff --git a/drivers/gpu/drm/vkms/vkms_gem.c b/drivers/gpu/drm/vkms/vkms_gem.c
> index 138b0bb325cf9..69048e73377dc 100644
> --- a/drivers/gpu/drm/vkms/vkms_gem.c
> +++ b/drivers/gpu/drm/vkms/vkms_gem.c
> @@ -111,11 +111,8 @@ struct drm_gem_object *vkms_gem_create(struct drm_device *dev,
>
> ret = drm_gem_handle_create(file, &obj->gem, handle);
> drm_gem_object_put_unlocked(&obj->gem);
> - if (ret) {
> - drm_gem_object_release(&obj->gem);
> - kfree(obj);
> + if (ret)
> return ERR_PTR(ret);
> - }
>
> return &obj->gem;
> }
> --
> 2.21.0.rc2.261.ga7da99ff1b-goog
>
Hi,
Thanks for your patch! :)
The patch looks good for me. I also tested it under the IGT tests on my
local VM and everything was fine.
Reviewed-by: Rodrigo Siqueira <rodrigosiqueiramelo@gmail.com>
--
Rodrigo Siqueira
https://siqueira.tech
Graduate Student
Department of Computer Science
University of São Paulo
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
next prev parent reply other threads:[~2019-02-27 23:12 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <00000000000053fea105791276d8@google.com>
2018-10-29 11:51 ` KASAN: use-after-free Read in drm_gem_object_release Dmitry Vyukov
2019-02-26 20:47 ` [PATCH] drm/vgem: fix use-after-free when drm_gem_handle_create() fails Eric Biggers
2019-02-26 21:01 ` 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 [this message]
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=20190227231202.tycdbcqtk5ylwp4k@smtp.gmail.com \
--to=rodrigosiqueiramelo@gmail.com \
--cc=chris@chris-wilson.co.uk \
--cc=daniel.vetter@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=ebiggers@kernel.org \
--cc=hamohammed.sa@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=stable@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).