From patchwork Fri Nov 30 15:17:08 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 152559 Delivered-To: patches@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp3779514ljp; Fri, 30 Nov 2018 07:17:21 -0800 (PST) X-Google-Smtp-Source: AFSGD/VSs7nPzhqTFmdPn2w5b5q86rsIUGWsEKP/oc4iPa6XFFCoDnnjXqF6hTKCXB+cTxcO3TsY X-Received: by 2002:a63:e655:: with SMTP id p21mr5116058pgj.70.1543591041686; Fri, 30 Nov 2018 07:17:21 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1543591041; cv=none; d=google.com; s=arc-20160816; b=D6AKVAs6hT+QhbmyqxcF4US7dV0V49Ih6lIEAKjNIuy2JchTSHC8pyElo4V6+XwCUj bTKo3/R32i+kTXVJepfEey48KAQlmrh/GaDeFm2PLl64c8ECx2SF8WX7zE2zBUwPgFTR huHKyagaIhdOq4kVlgNvNnVdvlup3nzPwcJERchjVFGoM9u0YMkwtaol4XCj3fOGQy+1 wYppcqARavzA/o86M6zw8FBKQYxg7Z9UTJhaGgbLyuMdLRTKiycGDiS3DuMtTvq6B019 ej7h5TrccEy6PRgKUsyWyaO1ORuBJSVbKs3DHm36V/SPNtsQACnGjVnIaZYg2XYXregY yihg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from; bh=EtexVaJwnq2vPWw7MVdMcDkSVa8JircvQY+1IL6HTGc=; b=qhnSkAAznCOiWAfD3QeSRznhiib+if/r4pYvjO+zHtcWnYI2HxhFQI1wOVeGzi5t5x gM2JCQvduUc9EfsOBQIN2eEoeNqFSJcr5L9sZtESSPMYADcCgFnZlqqmpAEbKkLD5BKE hkytxlj2TYpoOIsUZ4WaxLSfUY1Gw8Gbk/QYwjbANV8cVoyFLUTpPLC7i60d7aMjbKNX /Jvifseye8BDKdSrVZA1ZbmgNPXn1Fd6OfDmYDehl7vF9rXAHqteSB6uxSRopICD7uvE caXiedYoKHNIX/UH37DekCkY0LmHabbw/k2/gqDh2w8v5A3zE8QLsWg8BMT9A7Tdj7+J 7Lzw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of pm215@archaic.org.uk designates 2001:8b0:1d0::2 as permitted sender) smtp.mailfrom=pm215@archaic.org.uk; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by mx.google.com with ESMTPS id c8si5054188pgc.65.2018.11.30.07.17.21 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 30 Nov 2018 07:17:21 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of pm215@archaic.org.uk designates 2001:8b0:1d0::2 as permitted sender) client-ip=2001:8b0:1d0::2; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of pm215@archaic.org.uk designates 2001:8b0:1d0::2 as permitted sender) smtp.mailfrom=pm215@archaic.org.uk; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from pm215 by orth.archaic.org.uk with local (Exim 4.89) (envelope-from ) id 1gSkXc-0005Q3-Et; Fri, 30 Nov 2018 15:17:16 +0000 From: Peter Maydell To: qemu-devel@nongnu.org Cc: patches@linaro.org, Stefan Hajnoczi , Eric Blake , "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 Subject: [PATCH 06/10] hw/i386/multiboot.c: Don't use load_image() Date: Fri, 30 Nov 2018 15:17:08 +0000 Message-Id: <20181130151712.2312-7-peter.maydell@linaro.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181130151712.2312-1-peter.maydell@linaro.org> References: <20181130151712.2312-1-peter.maydell@linaro.org> MIME-Version: 1.0 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(). Signed-off-by: Peter Maydell --- hw/i386/multiboot.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) -- 2.19.1 Reviewed-by: Eric Blake diff --git a/hw/i386/multiboot.c b/hw/i386/multiboot.c index 1a4344f5fc3..62340687e8e 100644 --- a/hw/i386/multiboot.c +++ b/hw/i386/multiboot.c @@ -343,7 +343,11 @@ int load_multiboot(FWCfgState *fw_cfg, mbs.mb_buf_size = TARGET_PAGE_ALIGN(mb_mod_length + mbs.mb_buf_size); mbs.mb_buf = g_realloc(mbs.mb_buf, mbs.mb_buf_size); - load_image(one_file, (unsigned char *)mbs.mb_buf + offs); + if (load_image_size(one_file, (unsigned char *)mbs.mb_buf + offs, + mbs.mb_buf_size - offs) < 0) { + error_report("Error loading file '%s'", one_file); + exit(1); + } mb_add_mod(&mbs, mbs.mb_buf_phys + offs, mbs.mb_buf_phys + offs + mb_mod_length, c);