From: P J P <ppandit@redhat.com>
To: Gerd Hoffmann <kraxel@redhat.com>
Cc: Qemu Developers <qemu-devel@nongnu.org>,
Zhenhao Hong <zhenhaohong@gmail.com>
Subject: Re: [Qemu-devel] [PATCH] display: virtio-gpu-3d: check virgl capabilities max_size
Date: Tue, 13 Dec 2016 17:20:51 +0530 (IST) [thread overview]
Message-ID: <alpine.LFD.2.20.1612131703450.6298@wniryva> (raw)
In-Reply-To: <1481627861.27088.116.camel@redhat.com>
Hello Gerd,
+-- On Tue, 13 Dec 2016, Gerd Hoffmann wrote --+
| On Di, 2016-12-13 at 12:44 +0530, P J P wrote:
| > From: Prasad J Pandit <pjp@fedoraproject.org>
| >
| > Virtio GPU device while processing 'VIRTIO_GPU_CMD_GET_CAPSET'
| > command, retrieves the maximum capabilities size to fill in the
| > response object. It continues to fill in capabilities even if
| > retrieved 'max_size' is zero(0), thus resulting in OOB access.
| > Add check to avoid it.
|
| Hmm? Did you see this happing in practice?
Yes, there is a reproducer from Zhenhao.
| > diff --git a/hw/display/virtio-gpu-3d.c b/hw/display/virtio-gpu-3d.c
| > index 758d33a..fbfb39f 100644
| > --- a/hw/display/virtio-gpu-3d.c
| > +++ b/hw/display/virtio-gpu-3d.c
| > @@ -371,11 +371,12 @@ static void virgl_cmd_get_capset(VirtIOGPU *g,
| > virgl_renderer_get_cap_set(gc.capset_id, &max_ver,
| > &max_size);
|
| This is not the guest returning the size, it is the host renderer
| library saying how much space it needs ...
The library funcion checks 'capset_id' supplied via the 'cmd' object, as
'gc' is initialised from a given command 'cmd'. It sets 'max_size=0' if
capset_id != VREND_CAP_SET.
VIRTIO_GPU_FILL_CMD(gc)
virgl_renderer_get_cap_set(gc.capset_id
-> vrend_renderer_get_cap_set
-> https://cgit.freedesktop.org/~airlied/virglrenderer/tree/src/vrend_renderer.c#n6280
if (cap_set != VREND_CAP_SET) {
*max_ver = 0;
*max_size = 0;
return;
}
| > - virgl_renderer_fill_caps(gc.capset_id,
| > - gc.capset_version,
| > - (void *)resp->capset_data);
|
| ... and here the renderer fills the qemu-allocated space with the actual
| data.
|
| Can't see anything wrong here.
IIUC, when max_size=0, g_malloc allocates memory for the 'resp' object,
with sizeof(capset_data)=0. But 'virgl_renderer_fill_caps' would try to fill
in upto sizeof(union virgl_caps).
-> https://cgit.freedesktop.org/~airlied/virglrenderer/tree/src/vrend_renderer.c#n5940
Thank you.
--
Prasad J Pandit / Red Hat Product Security Team
47AF CE69 3A90 54AA 9045 1053 DD13 3D32 FE5B 041F
next prev parent reply other threads:[~2016-12-13 11:51 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-12-13 7:14 [Qemu-devel] [PATCH] display: virtio-gpu-3d: check virgl capabilities max_size P J P
2016-12-13 10:52 ` Pankaj Gupta
2016-12-13 11:33 ` P J P
2016-12-13 11:17 ` Gerd Hoffmann
2016-12-13 11:50 ` P J P [this message]
2016-12-13 12:07 ` Gerd Hoffmann
2016-12-13 14:26 ` P J P
2016-12-13 16:01 ` Marc-André Lureau
2016-12-14 7:03 ` P J P
-- strict thread matches above, loose matches on Subject: below --
2016-12-14 7:01 P J P
2016-12-20 11:04 ` P J P
2016-12-20 14:36 ` Gerd Hoffmann
2016-12-20 11:08 ` Marc-André Lureau
2016-12-20 11:56 ` P J P
2016-12-20 13:52 ` Marc-André Lureau
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=alpine.LFD.2.20.1612131703450.6298@wniryva \
--to=ppandit@redhat.com \
--cc=kraxel@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=zhenhaohong@gmail.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).