From nobody Thu Nov 13 20:40:38 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1582526620; cv=none; d=zohomail.com; s=zohoarc; b=UDJbniiFPsn/uq3w/XfzWTt7Uqz6duPlizuTZ9DuKNlfbsSJnar7HQJiB06kd/40NM0aZ4+rghi2SD4YWguf3ULLbk5mj2p9ViS67q0wT0diBm4IgOfxXzedCt0T4vG0oDQ7ttEID7XBmjEUaoDBKy4ob7+se9YeeaUVP6LolWA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1582526620; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=TEihqII3XBX+rEByEZ21PgkIs+M+OQiUdcya50rxq/M=; b=LMTCy6ysq800gvlDXzOICGc6GzzrsJHQZ/Xt+ZQTQyAuHM97K4Sjm+DjZGeoeCRXcZQmhQ5INQ6qTPh42qhSPpuH1ZlVcNOUAWIzlrBVWNISLfvIUIGUx7zMrrcu0YrSKbhcb4igdbQ2RBEfSftyL+SAfJHN9YX6ClWnk2Xdurc= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1582526620141673.0018702419165; Sun, 23 Feb 2020 22:43:40 -0800 (PST) Received: from localhost ([::1]:60524 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j67St-00080w-4r for importer@patchew.org; Mon, 24 Feb 2020 01:43:39 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:47384) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j67SA-000793-10 for qemu-devel@nongnu.org; Mon, 24 Feb 2020 01:42:54 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j67S9-0008W6-0f for qemu-devel@nongnu.org; Mon, 24 Feb 2020 01:42:53 -0500 Received: from szxga07-in.huawei.com ([45.249.212.35]:56948 helo=huawei.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1j67S8-0008V3-Lp for qemu-devel@nongnu.org; Mon, 24 Feb 2020 01:42:52 -0500 Received: from DGGEMS405-HUB.china.huawei.com (unknown [172.30.72.60]) by Forcepoint Email with ESMTP id 8754A4B616F13571ED7D; Mon, 24 Feb 2020 14:42:50 +0800 (CST) Received: from DESKTOP-27KDQMV.china.huawei.com (10.173.228.124) by DGGEMS405-HUB.china.huawei.com (10.3.19.205) with Microsoft SMTP Server id 14.3.439.0; Mon, 24 Feb 2020 14:42:39 +0800 From: "Longpeng(Mike)" To: , Subject: [PATCH RESEND 1/3] vfio/pci: fix a null pointer reference in vfio_rom_read Date: Mon, 24 Feb 2020 14:42:17 +0800 Message-ID: <20200224064219.1434-2-longpeng2@huawei.com> X-Mailer: git-send-email 2.25.0.windows.1 In-Reply-To: <20200224064219.1434-1-longpeng2@huawei.com> References: <20200224064219.1434-1-longpeng2@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.173.228.124] X-CFilter-Loop: Reflected Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 45.249.212.35 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: longpeng2@huawei.com, arei.gonglei@huawei.com, huangzhichao@huawei.com, qemu-devel@nongnu.org, weifuqiang@huawei.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" From: Longpeng vfio_pci_load_rom() maybe failed and then the vdev->rom is NULL in some situation (though I've not encountered yet), maybe we should avoid the VM abort. Signed-off-by: Longpeng Reviewed-by: Laszlo Ersek --- hw/vfio/pci.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/hw/vfio/pci.c b/hw/vfio/pci.c index 5e75a95..ed798ae 100644 --- a/hw/vfio/pci.c +++ b/hw/vfio/pci.c @@ -768,7 +768,7 @@ static void vfio_update_msi(VFIOPCIDevice *vdev) } } =20 -static void vfio_pci_load_rom(VFIOPCIDevice *vdev) +static bool vfio_pci_load_rom(VFIOPCIDevice *vdev) { struct vfio_region_info *reg_info; uint64_t size; @@ -778,7 +778,7 @@ static void vfio_pci_load_rom(VFIOPCIDevice *vdev) if (vfio_get_region_info(&vdev->vbasedev, VFIO_PCI_ROM_REGION_INDEX, ®_info)) { error_report("vfio: Error getting ROM info: %m"); - return; + return false; } =20 trace_vfio_pci_load_rom(vdev->vbasedev.name, (unsigned long)reg_info->= size, @@ -797,7 +797,7 @@ static void vfio_pci_load_rom(VFIOPCIDevice *vdev) error_printf("Device option ROM contents are probably invalid " "(check dmesg).\nSkip option ROM probe with rombar=3D0= , " "or load from file with romfile=3D\n"); - return; + return false; } =20 vdev->rom =3D g_malloc(size); @@ -849,6 +849,8 @@ static void vfio_pci_load_rom(VFIOPCIDevice *vdev) data[6] =3D -csum; } } + + return true; } =20 static uint64_t vfio_rom_read(void *opaque, hwaddr addr, unsigned size) @@ -863,8 +865,9 @@ static uint64_t vfio_rom_read(void *opaque, hwaddr addr= , unsigned size) uint64_t data =3D 0; =20 /* Load the ROM lazily when the guest tries to read it */ - if (unlikely(!vdev->rom && !vdev->rom_read_failed)) { - vfio_pci_load_rom(vdev); + if (unlikely(!vdev->rom && !vdev->rom_read_failed) && + !vfio_pci_load_rom(vdev)) { + return 0; } =20 memcpy(&val, vdev->rom + addr, --=20 1.8.3.1