From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Michael S. Tsirkin" Subject: [PATCH] thinko fix: move memset to after mmap failure check Date: Sun, 26 Apr 2009 14:46:38 +0300 Message-ID: <20090426114638.GA27129@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: avi@redhat.com To: kvm@vger.kernel.org Return-path: Received: from mx2.redhat.com ([66.187.237.31]:49336 "EHLO mx2.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752305AbZDZLrj (ORCPT ); Sun, 26 Apr 2009 07:47:39 -0400 Received: from int-mx2.corp.redhat.com (int-mx2.corp.redhat.com [172.16.27.26]) by mx2.redhat.com (8.13.8/8.13.8) with ESMTP id n3QBldVa027183 for ; Sun, 26 Apr 2009 07:47:39 -0400 Content-Disposition: inline Sender: kvm-owner@vger.kernel.org List-ID: By the time we've done a memset, it's too late to check the pointer for MAP_FAILED value. Let's compare to MAP_FAILED first. Signed-off-by: Michael S. Tsikirn --- Noticed this when reading the code. Makes sense, does it not? hw/device-assignment.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/hw/device-assignment.c b/hw/device-assignment.c index 1f0a1a7..0a5f850 100644 --- a/hw/device-assignment.c +++ b/hw/device-assignment.c @@ -1087,12 +1087,12 @@ static int assigned_dev_register_msix_mmio(AssignedDevice *dev) dev->msix_table_page = mmap(NULL, 0x1000, PROT_READ|PROT_WRITE, MAP_ANONYMOUS|MAP_PRIVATE, 0, 0); - memset(dev->msix_table_page, 0, 0x1000); if (dev->msix_table_page == MAP_FAILED) { fprintf(stderr, "fail allocate msix_table_page! %s\n", strerror(errno)); return -EFAULT; } + memset(dev->msix_table_page, 0, 0x1000); dev->mmio_index = cpu_register_io_memory(0, msix_mmio_read, msix_mmio_write, dev); return 0; -- 1.6.0.6