From patchwork Fri Dec 14 14:42:02 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 153864 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp2157900ljp; Fri, 14 Dec 2018 06:48:10 -0800 (PST) X-Google-Smtp-Source: AFSGD/WlkdY8XgEUBcNb6R8SZ6+xJCy9K34VmSq82lUC2JBRyw9t52fCCt1GfzAGCD5aJDaip4Ly X-Received: by 2002:ac8:1414:: with SMTP id k20mr3086204qtj.298.1544798890012; Fri, 14 Dec 2018 06:48:10 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1544798890; cv=none; d=google.com; s=arc-20160816; b=M06NQ0USwTwtuPHVkB6lAvzxhx7lggE3Y0SysfGqXp4c3pYJVxWcizW7G6GoJkG0Mh GO5/0UkLrG4eDIDluQmGZTJtZ/spxq/VCi0wGTR7JP2ofXMcEwsZYsYAnWQK1KGSBJ8F ryeKRiSEU13h7o1L6HvkuQwbf8GrDlbMeWFcA/zNWU3dMofqwNiLLA2zu2fV5skKuPH0 4taXCPjd+mhR7eJ1zSSbBjLtlcGZzIh7ym6iJ2g7ierqBhLQ2I5hzXSeqwY+gMGAUAKo ucOiSpKT3Ys8xnvvmu4kDAm4HldK+Jg7MJlXX8bny0k5an5AlLeBpq+vqB5aHpMcPbJe vTwA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=kLYPC7Wm3QxM1UYLBDMyWS5Qm4104WlYoADXOtQR4Js=; b=oCEgsh2oURqI79CD4sFIZTCB/hglHU4nxcR8hZvTYT8uV1jiz4j8vMkHJD5iWBLuUQ ysrpNWPV9FoxO/oYMBo2BSEV8GrqjGbquQb165Kt3Zp6ohK57Ik0+6CVMRJO1OMbCRvA WO1ntoFq1+6cUWMONoaR/4V17D4avJcdP44OBbRGRDl0WmveWeZ5hqlcW1eEMIP+Yjtt HPm1Fbsa2YgvusLAqxd4SDE1lw6/GT+O/saSCQpyt/YoXluu/EXgptD0mQSbUb6asSj5 UNzs7/mB7A2/w1pmNKh9jUyuU5364UkfXBs5DIPqVMYWcC/fm/+o4ckFIhBWLHL7klQq qtNA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=dClYfFKF; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id e59si3167025qtd.98.2018.12.14.06.48.09 for (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 14 Dec 2018 06:48:10 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=dClYfFKF; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:33897 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gXol7-0004Qo-EN for patch@linaro.org; Fri, 14 Dec 2018 09:48:09 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38358) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gXoff-0008T8-Em for qemu-devel@nongnu.org; Fri, 14 Dec 2018 09:42:32 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gXofe-0004Oe-J5 for qemu-devel@nongnu.org; Fri, 14 Dec 2018 09:42:31 -0500 Received: from mail-wr1-x429.google.com ([2a00:1450:4864:20::429]:40744) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gXofe-0004NW-Bg for qemu-devel@nongnu.org; Fri, 14 Dec 2018 09:42:30 -0500 Received: by mail-wr1-x429.google.com with SMTP id p4so5659962wrt.7 for ; Fri, 14 Dec 2018 06:42:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=kLYPC7Wm3QxM1UYLBDMyWS5Qm4104WlYoADXOtQR4Js=; b=dClYfFKFKTMoCp1PRErSaaXieS+jynevKvLMPRGCmqhbflKyp5HlRBK8Z7KhwQa0kI 4YLrQ5i+MB4K61jeo1Cw2xHRYsvqi2LszKTFUT++VtvkfYk4MuFYLEVA/CPwrkQOveSW Dnd2wkoI1WUFdWs/7OnJbCFo7NthWeFN81LDU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=kLYPC7Wm3QxM1UYLBDMyWS5Qm4104WlYoADXOtQR4Js=; b=nTSXwnZHhbCxj06pm6eM/ojPmOdq/LavsX/ipyQZtxEhw88LTZn8/u2AV3hNCVhG+o KMl39isG3q823oqeHq1aF2OtIVnoKDtWNq14OspUYXVUf8Y7W7PpSu8ZpwKVS9iz4rNa qFG05leA4Pcq7/t2knnh3j3GnhrwEFOM5U7FnO9qJIsSbMtagg7QBzWqz3HTj8WkmTSR YDh0MVfX0GR3beiSgb14sRvSNx32dRIsHg6zzZkHewVrj9IY3ZV+VVobkx01KJmaP+1+ ShlSXBOE4hbL/7BNP1oeByOBWRpUt2aa98qqP8+ZshPfg05ZzhcwDMou0AV3s9e+w3Dg tq6w== X-Gm-Message-State: AA+aEWaXnK6Hx4jqEq8HklMdhXRB5CfzwgeEZAWTgAjAaONIHzAoT7p1 IfXJYHksUj5mLOyKgfP0uqU+5oOCsTo= X-Received: by 2002:adf:e891:: with SMTP id d17mr3087971wrm.140.1544798549134; Fri, 14 Dec 2018 06:42:29 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id m6sm3263204wrv.24.2018.12.14.06.42.27 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 14 Dec 2018 06:42:27 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Date: Fri, 14 Dec 2018 14:42:02 +0000 Message-Id: <20181214144214.1260-11-peter.maydell@linaro.org> X-Mailer: git-send-email 2.19.2 In-Reply-To: <20181214144214.1260-1-peter.maydell@linaro.org> References: <20181214144214.1260-1-peter.maydell@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::429 Subject: [Qemu-devel] [PULL 10/22] hw/pci/pci.c: Don't use load_image() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" 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(). While we are converting this code, add an error-check for read failure. Signed-off-by: Peter Maydell Reviewed-by: Richard Henderson Reviewed-by: Stefan Hajnoczi Reviewed-by: Michael S. Tsirkin Reviewed-by: Eric Blake Message-id: 20181130151712.2312-5-peter.maydell@linaro.org --- hw/pci/pci.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) -- 2.19.2 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); if (is_default_rom) {