From patchwork Mon Jan 26 09:24:27 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 432698 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id D8C241401AC for ; Mon, 26 Jan 2015 20:38:23 +1100 (AEDT) Received: from localhost ([::1]:40697 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YFg7i-0002Np-4m for incoming@patchwork.ozlabs.org; Mon, 26 Jan 2015 04:38:22 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51847) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YFfuu-0007uT-Q0 for qemu-devel@nongnu.org; Mon, 26 Jan 2015 04:25:17 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YFfuq-00068c-UV for qemu-devel@nongnu.org; Mon, 26 Jan 2015 04:25:08 -0500 Received: from mail-wi0-x232.google.com ([2a00:1450:400c:c05::232]:44717) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YFfuq-00067A-Ok for qemu-devel@nongnu.org; Mon, 26 Jan 2015 04:25:04 -0500 Received: by mail-wi0-f178.google.com with SMTP id em10so8341730wid.5 for ; Mon, 26 Jan 2015 01:25:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:subject:date:message-id:in-reply-to:references; bh=3hPWIGBSSuJRgEwJ4ayTjVCjJh3ugZRh9Yw+yij1EtQ=; b=ZNwToLNoQQmRWg1LmWjFXFEOoGl7EWWTs4/5Xb2XaNYvCTMqGC5dWjioHWwt2dZpC5 PlI0B1AxSZHlkLy4eizLC01TLteqUCSDLX3NbBPlR4+dfz4+yeljkHjZPsCjIL2jxZZk laXMEtgrtmHyNquAGLvL0/rOZEI5IguLJn1C8LE+GL97uImOFzbY1N4qWgwp/7VLyDYq U7+K4uOdioW38MQd9GxyeXRzICXuhwlFaz4Ecy0331XobNl5ip/w7aGBSoKy6HyKoM01 URwPsSU/A9fpGPCoAQLhcRx8s1bSullFVARfSIdsduCULnO3tkJrWkgBTTN6++tc+bJG 5iow== X-Received: by 10.180.109.79 with SMTP id hq15mr3815021wib.47.1422264304186; Mon, 26 Jan 2015 01:25:04 -0800 (PST) Received: from playground.station (net-2-35-193-154.cust.vodafonedsl.it. [2.35.193.154]) by mx.google.com with ESMTPSA id 7sm13482382wjq.29.2015.01.26.01.25.02 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 26 Jan 2015 01:25:03 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Mon, 26 Jan 2015 10:24:27 +0100 Message-Id: <1422264270-19278-17-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1422264270-19278-1-git-send-email-pbonzini@redhat.com> References: <1422264270-19278-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a00:1450:400c:c05::232 Subject: [Qemu-devel] [PULL 16/19] exec: fix madvise of NULL pointer X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Coverity flags this as "dereference after null check". Not quite a dereference, since it will just EFAULT, but still nice to fix. Signed-off-by: Paolo Bonzini --- exec.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/exec.c b/exec.c index 410371d..6b79ad1 100644 --- a/exec.c +++ b/exec.c @@ -1386,12 +1386,13 @@ static ram_addr_t ram_block_add(RAMBlock *new_block, Error **errp) cpu_physical_memory_set_dirty_range(new_block->offset, new_block->used_length); - qemu_ram_setup_dump(new_block->host, new_block->max_length); - qemu_madvise(new_block->host, new_block->max_length, QEMU_MADV_HUGEPAGE); - qemu_madvise(new_block->host, new_block->max_length, QEMU_MADV_DONTFORK); - - if (kvm_enabled()) { - kvm_setup_guest_memory(new_block->host, new_block->max_length); + if (new_block->host) { + qemu_ram_setup_dump(new_block->host, new_block->max_length); + qemu_madvise(new_block->host, new_block->max_length, QEMU_MADV_HUGEPAGE); + qemu_madvise(new_block->host, new_block->max_length, QEMU_MADV_DONTFORK); + if (kvm_enabled()) { + kvm_setup_guest_memory(new_block->host, new_block->max_length); + } } return new_block->offset;