From nobody Wed Apr 24 13:06:07 2024 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; dkim=pass; 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; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1585051997; cv=none; d=zohomail.com; s=zohoarc; b=eYxKiL5mZIgCbbszo0fVKZMBg9fV9iRyiZ5MZRFQ5VMyoNYTGkJl2Tyl41I7aL7QRsXPOu/MVsOQv5OdliGJm/dNguOL7FOQvlyuEpO2nWVS4yiczXVC58n9MfG0qj3hSwDBnI3nJ93EnWtnwb7d2djxjgJZHjnpMaXuUbIcWKE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1585051997; h=Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=E0/swcLhJE4EaoC6Z3CoPkB0yEhoGd8GKliO/dHZIkY=; b=gNhEg9UPHDnVbAqqL55oSOEe/xCqbwdlunreteBa+GEjXRa5vpAaQ6UOSE2xtwqPv/g15QI9PAfLNR0ffaOtmUmSkzCe86fHcBMe8xrjEtlV8yFEi3ybypmkgrmB1ZKzDW2QJZxEUxbrQ8maic0GlpNCfYrAm1WntPZQpsuaCX0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1585051997410341.78957198961143; Tue, 24 Mar 2020 05:13:17 -0700 (PDT) Received: from localhost ([::1]:47728 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jGiQl-0007sd-PV for importer@patchew.org; Tue, 24 Mar 2020 08:13:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39648) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jGiPt-0007G5-La for qemu-devel@nongnu.org; Tue, 24 Mar 2020 08:12:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jGiPs-0004kO-Fd for qemu-devel@nongnu.org; Tue, 24 Mar 2020 08:12:21 -0400 Received: from mail-wr1-x443.google.com ([2a00:1450:4864:20::443]:34876) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jGiPs-0004k2-43 for qemu-devel@nongnu.org; Tue, 24 Mar 2020 08:12:20 -0400 Received: by mail-wr1-x443.google.com with SMTP id d5so8775315wrn.2 for ; Tue, 24 Mar 2020 05:12:19 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id t12sm12437362wrm.0.2020.03.24.05.12.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 24 Mar 2020 05:12:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=E0/swcLhJE4EaoC6Z3CoPkB0yEhoGd8GKliO/dHZIkY=; b=PO9Zkmc/+cRnS9P6bmjo1TcrSbko2mgwNoCGT79hWKw8uVvLZ7jwFAOHXy3rfRT53p bLvlLWj1Ua2Arody7AD6Ybn540DL9+GaIgevdtxbcrOJr0QMF2h8r6JjEQ7b6OTnqJv+ oEXr5sz8yWrze819ltLEftV4g4f0XHpSirMgieV5oiO3JWgdtWCMkekLmCziTGdHVqjA 5d7B527kbc8GkIT5Bw5vXSmYzAd3+xIwQ/v91mJ13nEiSr69qpUkD2cbvQ/OC1f+gtsh LHnqblS1s/O/T2jGn8eF218RcwrRSEi71gloNbH74MQuJcWS+5oVM3kQVy7U64FqFjUK 8pPA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=E0/swcLhJE4EaoC6Z3CoPkB0yEhoGd8GKliO/dHZIkY=; b=gvREiUOY0xycUyH3Jhn6/IsbUcplj3xMbaHnPaTVABMQUsFBPGxx5qashi5K40a8jy 5zsVY4rqn+aVXuOMZluGbGgmg+gcIOt34qicK9eWLbc93vBIhOtsXNCuN9vZ7uCrZnB7 AH0qD4itislJ8XBg+qQ57WSptsgi+tyzHRXdl04fZxphL3Vk3MpmOe94QTZ/MzUeLqVz u6HS0B7VXSV0kHG3i79ikBgiYPsel8pxN8eFhCfU7pRH9eweOsEWOgNtMg6YtNrPZLtx fdjBXKODTvx7b5F7ab84b71XIV5NLFyaZcB3kecGvPPUureNLeK2TDkkCPIy8LY6N3Zi FVVQ== X-Gm-Message-State: ANhLgQ3b64sPL7NJCom2vLdqlW5qblFd8ViRQtMjWwZKcVpUzDCRnRvI rPOJW93PSQWgIg/do5Zz/fFQrzIsxKiPKw== X-Google-Smtp-Source: ADFU+vu1Pd+Dvdmv3HMQJqhc+bMtdqlBkMTeiMDtDzBwP1CB0z+GcHx0uLk3Kql1T2hQ3rIXQJNxcg== X-Received: by 2002:adf:f852:: with SMTP id d18mr12551904wrq.172.1585051938669; Tue, 24 Mar 2020 05:12:18 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PATCH for-5.0] hw/ppc/e500.c: Handle qemu_find_file() failure Date: Tue, 24 Mar 2020 12:12:16 +0000 Message-Id: <20200324121216.23899-1-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::443 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: qemu-ppc@nongnu.org, David Gibson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) Content-Type: text/plain; charset="utf-8" If qemu_find_file() doesn't find the BIOS it returns NULL; we were passing that unchecked through to load_elf(), which assumes a non-NULL pointer and may misbehave. In practice it fails with a weird message: $ qemu-system-ppc -M ppce500 -display none -kernel nonesuch Bad address qemu-system-ppc: could not load firmware '(null)' Handle the failure case better: $ qemu-system-ppc -M ppce500 -display none -kernel nonesuch qemu-system-ppc: could not find firmware/kernel file 'nonesuch' Spotted by Coverity (CID 1238954). Signed-off-by: Peter Maydell Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/ppc/e500.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/hw/ppc/e500.c b/hw/ppc/e500.c index 854cd3ac465..0d1f41197cf 100644 --- a/hw/ppc/e500.c +++ b/hw/ppc/e500.c @@ -1047,6 +1047,10 @@ void ppce500_init(MachineState *machine) } =20 filename =3D qemu_find_file(QEMU_FILE_TYPE_BIOS, payload_name); + if (!filename) { + error_report("could not find firmware/kernel file '%s'", payload_n= ame); + exit(1); + } =20 payload_size =3D load_elf(filename, NULL, NULL, NULL, &bios_entry, &loadaddr, NULL, NULL, --=20 2.20.1