From: "Michael S. Tsirkin" <mst@redhat.com>
To: "Andreas Färber" <afaerber@suse.de>
Cc: Bruce Rogers <brogers@suse.com>,
Sebastian Krahmer <krahmer@suse.com>,
qemu-stable@nongnu.org, qemu-devel@nongnu.org,
David Marchand <david.marchand@6wind.com>,
Stefan Hajnoczi <stefanha@redhat.com>,
Cam Macdonell <cam@cs.ualberta.ca>
Subject: Re: [Qemu-devel] [PATCH v3 2/4] ivshmem: validate incoming_posn value from server
Date: Mon, 22 Sep 2014 14:21:26 +0300 [thread overview]
Message-ID: <20140922112126.GE14882@redhat.com> (raw)
In-Reply-To: <1410799208-3250-3-git-send-email-afaerber@suse.de>
On Mon, Sep 15, 2014 at 06:40:06PM +0200, Andreas Färber wrote:
> From: Stefan Hajnoczi <stefanha@redhat.com>
>
> Check incoming_posn to avoid out-of-bounds array accesses if the ivshmem
> server on the host sends invalid values.
>
> Cc: Cam Macdonell <cam@cs.ualberta.ca>
> Reported-by: Sebastian Krahmer <krahmer@suse.de>
> Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
> [AF: Tighten upper bound check for posn in close_guest_eventfds()]
> Cc: qemu-stable@nongnu.org
> Signed-off-by: Andreas Färber <afaerber@suse.de>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
> ---
> hw/misc/ivshmem.c | 8 ++++++++
> 1 file changed, 8 insertions(+)
>
> diff --git a/hw/misc/ivshmem.c b/hw/misc/ivshmem.c
> index caeee1e..24f74f6 100644
> --- a/hw/misc/ivshmem.c
> +++ b/hw/misc/ivshmem.c
> @@ -389,6 +389,9 @@ static void close_guest_eventfds(IVShmemState *s, int posn)
> if (!ivshmem_has_feature(s, IVSHMEM_IOEVENTFD)) {
> return;
> }
> + if (posn < 0 || posn >= s->nb_peers) {
> + return;
> + }
>
> guest_curr_max = s->peers[posn].nb_eventfds;
>
> @@ -455,6 +458,11 @@ static void ivshmem_read(void *opaque, const uint8_t *buf, int size)
> }
> }
>
> + if (incoming_posn < -1) {
> + IVSHMEM_DPRINTF("invalid incoming_posn %ld\n", incoming_posn);
> + return;
> + }
> +
> /* pick off s->server_chr->msgfd and store it, posn should accompany msg */
> tmp_fd = qemu_chr_fe_get_msgfd(s->server_chr);
> IVSHMEM_DPRINTF("posn is %ld, fd is %d\n", incoming_posn, tmp_fd);
> --
> 1.8.4.5
next prev parent reply other threads:[~2014-09-22 11:18 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-09-15 16:40 [Qemu-devel] [PATCH v3 0/4] ivshmem security fixes Andreas Färber
2014-09-15 16:40 ` [Qemu-devel] [PATCH v3 1/4] ivshmem: Check ivshmem_read() size argument Andreas Färber
2014-09-22 11:21 ` Michael S. Tsirkin
2014-09-15 16:40 ` [Qemu-devel] [PATCH v3 2/4] ivshmem: validate incoming_posn value from server Andreas Färber
2014-09-22 11:21 ` Michael S. Tsirkin [this message]
2014-09-15 16:40 ` [Qemu-devel] [PATCH v3 3/4] ivshmem: Fix potential OOB r/w access Andreas Färber
2014-09-22 11:21 ` Michael S. Tsirkin
2014-09-15 16:40 ` [Qemu-devel] [PATCH v3 4/4] ivshmem: Fix fd leak on error Andreas Färber
2014-09-22 11:22 ` Michael S. Tsirkin
2014-10-31 16:03 ` [Qemu-devel] [PATCH v3 0/4] ivshmem security fixes Paolo Bonzini
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=20140922112126.GE14882@redhat.com \
--to=mst@redhat.com \
--cc=afaerber@suse.de \
--cc=brogers@suse.com \
--cc=cam@cs.ualberta.ca \
--cc=david.marchand@6wind.com \
--cc=krahmer@suse.com \
--cc=qemu-devel@nongnu.org \
--cc=qemu-stable@nongnu.org \
--cc=stefanha@redhat.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).