From patchwork Tue Mar 29 11:20:51 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= X-Patchwork-Id: 8685801 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id EE476C0553 for ; Tue, 29 Mar 2016 11:21:46 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 521B620259 for ; Tue, 29 Mar 2016 11:21:46 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id AFCC120253 for ; Tue, 29 Mar 2016 11:21:45 +0000 (UTC) Received: from localhost ([::1]:45919 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1akriS-0000jC-IR for patchwork-qemu-devel@patchwork.kernel.org; Tue, 29 Mar 2016 07:21:44 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47387) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1akriL-0000iw-0N for qemu-devel@nongnu.org; Tue, 29 Mar 2016 07:21:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1akriH-0004C6-0H for qemu-devel@nongnu.org; Tue, 29 Mar 2016 07:21:36 -0400 Received: from mail-qg0-x22d.google.com ([2607:f8b0:400d:c04::22d]:35521) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1akriG-0004C2-S9 for qemu-devel@nongnu.org; Tue, 29 Mar 2016 07:21:32 -0400 Received: by mail-qg0-x22d.google.com with SMTP id y89so8845616qge.2 for ; Tue, 29 Mar 2016 04:21:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=R9/KiHYPNL9beQgdYe1L83TVTFdqgh0Vcj14dryyANQ=; b=Z3Acskz8BIXYrsTvnLfZLb9XUkygnKhTk64tlCIAT7Z0XHaFW/1l4ePsa6SyWxFOzy k+GgByskZg5tAUvNXe9I6zM/XlUzSj7yr18wGIk+lPen8SnbfoJ/2fUJ0aY9tH7kMLPw N7+4XzlmYCAUtim8dXozFOcHRUSu42kFetvbCDDFxaGeAGdKm+WggfWlA9yFk0AnkHmQ mRA+riXMzfyFrEv5i+jh7CYPfvSnfxGq9dDTe9evJyVdC24jJ1fp2z9aYyjOzj9oyzEQ SYmVZ//2r56HEM6zd2hxyNe5UlxNpj1AWgGDXCSJRT3LzPPvpifryY29ijD9ry8tZxoO y5Mw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :mime-version:content-transfer-encoding; bh=R9/KiHYPNL9beQgdYe1L83TVTFdqgh0Vcj14dryyANQ=; b=N959XHTmg1C/rLFR1EtKwrXj3kFfMMpVy1Z3V5VVn9cSoKr0R7CIy7CNmSB1UQhs16 b3iQwrvQzh48c01bxqDF2G7fr11nysFib29ZNjNZ1Z7MlRueiSxN0d5+ptTIE0QXlIWO LxzUuOcuQv8Mfl0s3q6O3hnyuHiSMWr1S4YDeEbj1elrQZKhfJpKmWEStTPzvqUEuEWA 3e2R2EpF5cqnMBOLyF5FwSPCCzVaNUVuAude/L1Ts6g0WlcS4bVHmnka3K0FoE+llovo qi38ptoeHI/2DyMhEuCmpOt6YUUvncUlh3Xog7wAwsu7CLlIbUiCoSdHppl7IKzsKrwA 2tIQ== X-Gm-Message-State: AD7BkJJzoWDdLf34VIw+rJZfb08UHP8zI4Qm0oMoSumHrhkqLzVUzrx2G8m8ZKRaWlYczw== X-Received: by 10.140.238.76 with SMTP id j73mr1988011qhc.49.1459250492379; Tue, 29 Mar 2016 04:21:32 -0700 (PDT) Received: from localhost ([80.215.236.144]) by smtp.gmail.com with ESMTPSA id a11sm13683856qge.43.2016.03.29.04.21.30 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 29 Mar 2016 04:21:31 -0700 (PDT) From: marcandre.lureau@redhat.com To: qemu-devel@nongnu.org Date: Tue, 29 Mar 2016 13:20:51 +0200 Message-Id: <1459250451-29984-1-git-send-email-marcandre.lureau@redhat.com> X-Mailer: git-send-email 2.5.5 MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2607:f8b0:400d:c04::22d Cc: pbonzini@redhat.com, arei.gonglei@huawei.com, famz@redhat.com, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Subject: [Qemu-devel] [PATCH] memory: fix segv on qemu_ram_free(block=0x0) 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+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Marc-André Lureau Since f1060c55bf1377b4, the pointer is directly passed to qemu_ram_free(). However, on initialization failure, it may be called with a NULL pointer. Return immediately in this case. This fixes a SEGV when memory initialization failed, for example permission denied on open backing store /dev/hugepages, with -object memory-backend-file,mem-path=/dev/hugepages. Program received signal SIGSEGV, Segmentation fault. 0x00005555556e67e7 in qemu_ram_free (block=0x0) at /home/elmarco/src/qemu/exec.c:1775 Signed-off-by: Marc-André Lureau --- exec.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/exec.c b/exec.c index f398d21..965f3b2 100644 --- a/exec.c +++ b/exec.c @@ -1771,6 +1771,10 @@ static void reclaim_ramblock(RAMBlock *block) void qemu_ram_free(RAMBlock *block) { + if (!block) { + return; + } + qemu_mutex_lock_ramlist(); QLIST_REMOVE_RCU(block, next); ram_list.mru_block = NULL;