From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50803) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WW0h8-0003Tr-0Y for qemu-devel@nongnu.org; Fri, 04 Apr 2014 05:46:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WW0h1-00008g-6B for qemu-devel@nongnu.org; Fri, 04 Apr 2014 05:45:53 -0400 Received: from mail-wg0-f46.google.com ([74.125.82.46]:35536) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WW0h1-00006c-1K for qemu-devel@nongnu.org; Fri, 04 Apr 2014 05:45:47 -0400 Received: by mail-wg0-f46.google.com with SMTP id b13so3177206wgh.29 for ; Fri, 04 Apr 2014 02:45:46 -0700 (PDT) From: Dmitry Fleytman Date: Fri, 4 Apr 2014 12:45:20 +0300 Message-Id: <1396604722-11902-3-git-send-email-dmitry@daynix.com> In-Reply-To: <1396604722-11902-1-git-send-email-dmitry@daynix.com> References: <1396604722-11902-1-git-send-email-dmitry@daynix.com> Subject: [Qemu-devel] [PATCH V2 2/4] vmxnet3: validate queues configuration coming from quest List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: "Michael S. Tsirkin" , mdroth@linux.vnet.ibm.com, qemu-stable@nongnu.org, Stefan Hajnoczi , Dmitry Fleytman , Paolo Bonzini , "Dr. David Alan Gilbert" CVE-2013-4544 Signed-off-by: Dmitry Fleytman Reported-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- hw/net/vmxnet3.c | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/hw/net/vmxnet3.c b/hw/net/vmxnet3.c index 0b317f8..4fefc7b 100644 --- a/hw/net/vmxnet3.c +++ b/hw/net/vmxnet3.c @@ -1336,6 +1336,23 @@ static void vmxnet3_validate_interrupts(VMXNET3State *s) } } +static void vmxnet3_validate_queues(VMXNET3State *s) +{ + /* + * txq_num and rxq_num are total number of queues + * configured by guest. These numbers must not + * exceed corresponding maximal values. + */ + + if (s->txq_num > VMXNET3_DEVICE_MAX_TX_QUEUES) { + hw_error("Bad TX queues number: %d\n", s->txq_num); + } + + if (s->rxq_num > VMXNET3_DEVICE_MAX_RX_QUEUES) { + hw_error("Bad RX queues number: %d\n", s->rxq_num); + } +} + static void vmxnet3_activate_device(VMXNET3State *s) { int i; @@ -1382,7 +1399,7 @@ static void vmxnet3_activate_device(VMXNET3State *s) VMXNET3_READ_DRV_SHARED8(s->drv_shmem, devRead.misc.numRxQueues); VMW_CFPRN("Number of TX/RX queues %u/%u", s->txq_num, s->rxq_num); - assert(s->txq_num <= VMXNET3_DEVICE_MAX_TX_QUEUES); + vmxnet3_validate_queues(s); qdescr_table_pa = VMXNET3_READ_DRV_SHARED64(s->drv_shmem, devRead.misc.queueDescPA); -- 1.8.5.3