From nobody Wed Nov 5 07:15:24 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1533900283950934.1924760761375; Fri, 10 Aug 2018 04:24:43 -0700 (PDT) Received: from localhost ([::1]:55517 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fo5Wx-0000bw-Dh for importer@patchew.org; Fri, 10 Aug 2018 07:24:31 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53269) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fo5W6-0000JG-KH for qemu-devel@nongnu.org; Fri, 10 Aug 2018 07:23:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fo5W3-0006L3-GC for qemu-devel@nongnu.org; Fri, 10 Aug 2018 07:23:38 -0400 Received: from chuckie.co.uk ([82.165.15.123]:45385 helo=s16892447.onlinehome-server.info) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fo5W3-0006If-8k for qemu-devel@nongnu.org; Fri, 10 Aug 2018 07:23:35 -0400 Received: from host86-189-155-101.range86-189.btcentralplus.com ([86.189.155.101] helo=kentang.home) by s16892447.onlinehome-server.info with esmtpsa (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.76) (envelope-from ) id 1fo5WE-0001Dn-83; Fri, 10 Aug 2018 12:23:47 +0100 From: Mark Cave-Ayland To: qemu-devel@nongnu.org, atar4qemu@gmail.com, thuth@redhat.com Date: Fri, 10 Aug 2018 12:23:23 +0100 Message-Id: <20180810112323.25206-1-mark.cave-ayland@ilande.co.uk> X-Mailer: git-send-email 2.11.0 X-SA-Exim-Connect-IP: 86.189.155.101 X-SA-Exim-Mail-From: mark.cave-ayland@ilande.co.uk X-SA-Exim-Version: 4.2.1 (built Sun, 08 Jan 2012 02:45:44 +0000) X-SA-Exim-Scanned: Yes (on s16892447.onlinehome-server.info) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 82.165.15.123 Subject: [Qemu-devel] [PATCH] sun4u: ensure kernel_top is always initialised 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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Valgrind reports that when loading a non-ELF kernel, kernel_top may be used uninitialised when checking for an initrd. Since there are no known non-ELF kernels for SPARC64 then we can simply initialise kernel_top to 0 and then skip the initrd load process if it hasn= 't been set by load_elf(). Reported-by: Thomas Huth Signed-off-by: Mark Cave-Ayland Reviewed-by: Thomas Huth --- hw/sparc64/sun4u.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/sparc64/sun4u.c b/hw/sparc64/sun4u.c index 74b748497e..d16843b30e 100644 --- a/hw/sparc64/sun4u.c +++ b/hw/sparc64/sun4u.c @@ -139,7 +139,7 @@ static uint64_t sun4u_load_kernel(const char *kernel_fi= lename, unsigned int i; long kernel_size; uint8_t *ptr; - uint64_t kernel_top; + uint64_t kernel_top =3D 0; =20 linux_boot =3D (kernel_filename !=3D NULL); =20 @@ -172,7 +172,7 @@ static uint64_t sun4u_load_kernel(const char *kernel_fi= lename, } /* load initrd above kernel */ *initrd_size =3D 0; - if (initrd_filename) { + if (initrd_filename && kernel_top) { *initrd_addr =3D TARGET_PAGE_ALIGN(kernel_top); =20 *initrd_size =3D load_image_targphys(initrd_filename, --=20 2.11.0