From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58110) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gSpJu-0005j9-4Q for qemu-devel@nongnu.org; Fri, 30 Nov 2018 15:23:26 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gSpJp-0001gA-R4 for qemu-devel@nongnu.org; Fri, 30 Nov 2018 15:23:25 -0500 References: <20181130151712.2312-1-peter.maydell@linaro.org> <20181130151712.2312-5-peter.maydell@linaro.org> From: Eric Blake Message-ID: Date: Fri, 30 Nov 2018 14:22:47 -0600 MIME-Version: 1.0 In-Reply-To: <20181130151712.2312-5-peter.maydell@linaro.org> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH 04/10] hw/pci/pci.c: Don't use load_image() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Peter Maydell , qemu-devel@nongnu.org Cc: patches@linaro.org, Stefan Hajnoczi , "Daniel P . Berrange" , Li Zhijian , Philip Li , Peter Crosthwaite , Alexander Graf , Kevin Wolf , Max Reitz , "Michael S. Tsirkin" , Marcel Apfelbaum , David Gibson , Igor Mammedov , qemu-block@nongnu.org, qemu-ppc@nongnu.org On 11/30/18 9:17 AM, Peter Maydell wrote: > The load_image() function is deprecated, as it does not let the > caller specify how large the buffer to read the file into is. > Instead use load_image_size(). Commit message should mention the addition of error checking. > > Signed-off-by: Peter Maydell > --- > hw/pci/pci.c | 6 +++++- > 1 file changed, 5 insertions(+), 1 deletion(-) > > diff --git a/hw/pci/pci.c b/hw/pci/pci.c > index 56b13b3320e..efb5ce196ff 100644 > --- a/hw/pci/pci.c > +++ b/hw/pci/pci.c > @@ -2261,7 +2261,11 @@ static void pci_add_option_rom(PCIDevice *pdev, bool is_default_rom, > pdev->has_rom = true; > memory_region_init_rom(&pdev->rom, OBJECT(pdev), name, size, &error_fatal); > ptr = memory_region_get_ram_ptr(&pdev->rom); > - load_image(path, ptr); > + if (load_image_size(path, ptr, size) < 0) { > + error_setg(errp, "failed to load romfile \"%s\"", pdev->romfile); > + g_free(path); > + return; > + } > g_free(path); But the code change itself is fine: Reviewed-by: Eric Blake -- Eric Blake, Principal Software Engineer Red Hat, Inc. +1-919-301-3266 Virtualization: qemu.org | libvirt.org