From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:51152)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <mst@redhat.com>) id 1Vnwjg-0003pw-I3
	for qemu-devel@nongnu.org; Tue, 03 Dec 2013 15:38:29 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <mst@redhat.com>) id 1Vnwjb-0000yh-Rk
	for qemu-devel@nongnu.org; Tue, 03 Dec 2013 15:38:24 -0500
Date: Tue, 3 Dec 2013 22:41:39 +0200
From: "Michael S. Tsirkin" <mst@redhat.com>
Message-ID: <20131203204139.GA5670@redhat.com>
References: <1386087086-3691-1-git-send-email-mst@redhat.com>
	<1386087086-3691-8-git-send-email-mst@redhat.com>
	<CAFEAcA-ETqGzRAGFVgyC8=2GwUGCZ-ytSFFPzQQnobYTt186uA@mail.gmail.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <CAFEAcA-ETqGzRAGFVgyC8=2GwUGCZ-ytSFFPzQQnobYTt186uA@mail.gmail.com>
Subject: Re: [Qemu-devel] [PATCH 07/23] hw/pci/pcie_aer.c: fix buffer
 overruns on invalid state load
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Peter Maydell <peter.maydell@linaro.org>
Cc: QEMU Developers <qemu-devel@nongnu.org>, Anthony Liguori <anthony@codemonkey.ws>, qemu-stable <qemu-stable@nongnu.org>

On Tue, Dec 03, 2013 at 06:30:46PM +0000, Peter Maydell wrote:
> On 3 December 2013 16:28, Michael S. Tsirkin <mst@redhat.com> wrote:
> > 4) CVE-2013-4529
> > hw/pci/pcie_aer.c    pcie aer log can overrun the buffer if log_num is
> >                      too large
> >
> > There are two issues in this file:
> > 1. log_max from remote can be larger than on local
> > then buffer will overrun with data coming from state file.
> > 2. log_num can be larger then we get data corrution
> > again with an overflow but not adversary controlled.
> >
> > Fix both issues.
> >
> > Reported-by: Anthony Liguori <anthony@codemonkey.ws>
> > Reported-by: Michael S. Tsirkin <mst@redhat.com>
> > Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
> > ---
> >  hw/pci/pcie_aer.c | 15 +++++++++++++--
> >  1 file changed, 13 insertions(+), 2 deletions(-)
> >
> > diff --git a/hw/pci/pcie_aer.c b/hw/pci/pcie_aer.c
> > index 991502e..92f3f20 100644
> > --- a/hw/pci/pcie_aer.c
> > +++ b/hw/pci/pcie_aer.c
> > @@ -795,15 +795,26 @@ static const VMStateDescription vmstate_pcie_aer_err = {
> >      }
> >  };
> >
> > +static int pcie_aer_state_post_load(void *opaque, int version_id)
> > +{
> > +    PCIEAERLog *s = opaque;
> > +
> > +    if (s->log_num > s->log_max) {
> > +        return -1;
> > +    }
> > +    return 0;
> > +}
> > +
> >  const VMStateDescription vmstate_pcie_aer_log = {
> >      .name = "PCIE_AER_ERROR_LOG",
> >      .version_id = 1,
> >      .minimum_version_id = 1,
> >      .minimum_version_id_old = 1,
> > +    .post_load = pcie_aer_state_post_load,
> >      .fields     = (VMStateField[]) {
> >          VMSTATE_UINT16(log_num, PCIEAERLog),
> > -        VMSTATE_UINT16(log_max, PCIEAERLog),
> > -        VMSTATE_STRUCT_VARRAY_POINTER_UINT16(log, PCIEAERLog, log_num,
> > +        VMSTATE_UINT16_EQUAL(log_max, PCIEAERLog),
> > +        VMSTATE_STRUCT_VARRAY_POINTER_UINT16(log, PCIEAERLog, log_max,
> >                                vmstate_pcie_aer_err, PCIEAERErr),
> >          VMSTATE_END_OF_LIST()
> >      }
> 
> Isn't this a migration compability break?

How is it a break?

> If so the version ID
> needs to be bumped.
> 
> thanks
> -- PMM