From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49032) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WUwN6-0002Bq-OC for qemu-devel@nongnu.org; Tue, 01 Apr 2014 06:56:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WUwN1-0003Q5-Ul for qemu-devel@nongnu.org; Tue, 01 Apr 2014 06:56:48 -0400 Date: Tue, 1 Apr 2014 11:56:31 +0100 From: "Dr. David Alan Gilbert" Message-ID: <20140401105630.GH2411@work-vm> References: <1396275242-10810-1-git-send-email-mst@redhat.com> <1396275242-10810-11-git-send-email-mst@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1396275242-10810-11-git-send-email-mst@redhat.com> Subject: Re: [Qemu-devel] [PATCH v4 10/30] hw/pci/pcie_aer.c: fix buffer overruns on invalid state load List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: "Michael S. Tsirkin" Cc: mdroth@linux.vnet.ibm.com, qemu-devel@nongnu.org, Anthony Liguori , qemu-stable@nongnu.org * 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 corruption > again with an overflow but not adversary controlled. > > Fix both issues. > > Reported-by: Anthony Liguori > Reported-by: Michael S. Tsirkin > Signed-off-by: Michael S. Tsirkin Reviewed-by: Dr. David Alan Gilbert > --- > hw/pci/pcie_aer.c | 10 +++++++++- > 1 file changed, 9 insertions(+), 1 deletion(-) > > diff --git a/hw/pci/pcie_aer.c b/hw/pci/pcie_aer.c > index 991502e..535be2c 100644 > --- a/hw/pci/pcie_aer.c > +++ b/hw/pci/pcie_aer.c > @@ -795,6 +795,13 @@ static const VMStateDescription vmstate_pcie_aer_err = { > } > }; > > +static bool pcie_aer_state_log_num_valid(void *opaque, int version_id) > +{ > + PCIEAERLog *s = opaque; > + > + return s->log_num <= s->log_max; > +} > + > const VMStateDescription vmstate_pcie_aer_log = { > .name = "PCIE_AER_ERROR_LOG", > .version_id = 1, > @@ -802,7 +809,8 @@ const VMStateDescription vmstate_pcie_aer_log = { > .minimum_version_id_old = 1, > .fields = (VMStateField[]) { > VMSTATE_UINT16(log_num, PCIEAERLog), > - VMSTATE_UINT16(log_max, PCIEAERLog), > + VMSTATE_UINT16_EQUAL(log_max, PCIEAERLog), > + VMSTATE_VALIDATE("log_num <= log_max", pcie_aer_state_log_num_valid), > VMSTATE_STRUCT_VARRAY_POINTER_UINT16(log, PCIEAERLog, log_num, > vmstate_pcie_aer_err, PCIEAERErr), > VMSTATE_END_OF_LIST() > -- > MST > > -- Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK