From nobody Tue Nov 11 01:36:09 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1560846978; cv=none; d=zoho.com; s=zohoarc; b=dzUcPh09dTlgYp9F+peWZv5aJnRIou2PUgFxO2yfQKr1LM2vFARGN/VHP+apNOiX5NLa7edW0+TjGsbiQIOc7k6KWD5P0LQ4ziwVzRhxNy1rPP8VwsauYdVRRh+t50Ihmk0a2YDUZ3Ls8A4u1Xi/Ls8TZWly3Ee8zZsNUs0b42I= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1560846978; 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:ARC-Authentication-Results; bh=Ybgj9ymHBe3I4wIlf9SANjUkWNFDc1rJ7T86oUhayzQ=; b=nvJFampBXmUvBYo0/1NJY1a8WtZ4KOdAqZd2kiIeQgE6ns9uVCzBdYZkBMo/XsO1itOqibknEWv0qexU7lp/dUSKjCLhRQBio4J5Z+qvKMjnYi3lJKtM7QLHPla/YcY7m45nMqN5f/3xKqZetvIZRTGfsLxlwqF4BrOdERAFrt4= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1560846977933607.0822669243773; Tue, 18 Jun 2019 01:36:17 -0700 (PDT) Received: from localhost ([::1]:54786 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hd9b6-0007vZ-IE for importer@patchew.org; Tue, 18 Jun 2019 04:36:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41258) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hd9a0-0007Ef-Hl for qemu-devel@nongnu.org; Tue, 18 Jun 2019 04:35:02 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hd9Zz-0000lp-E3 for qemu-devel@nongnu.org; Tue, 18 Jun 2019 04:35:00 -0400 Received: from mx1.redhat.com ([209.132.183.28]:48712) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hd9Zx-0000cP-Ax; Tue, 18 Jun 2019 04:34:57 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 54863307FBCB; Tue, 18 Jun 2019 08:34:45 +0000 (UTC) Received: from kamzik.brq.redhat.com (unknown [10.43.2.160]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5C6A882749; Tue, 18 Jun 2019 08:34:44 +0000 (UTC) From: Andrew Jones To: qemu-devel@nongnu.org, qemu-arm@nongnu.org Date: Tue, 18 Jun 2019 10:34:42 +0200 Message-Id: <20190618083442.10407-1-drjones@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.41]); Tue, 18 Jun 2019 08:34:45 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH] hw/arm/boot: fix direct kernel boot setup 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: peter.maydell@linaro.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" We need to check ram_end, not ram_size. Fixes: 852dc64d665f ("hw/arm/boot: Diagnose layouts that put initrd or DTB off the end of RAM") Signed-off-by: Andrew Jones Reviewed-by: Peter Maydell Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/arm/boot.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/arm/boot.c b/hw/arm/boot.c index b2f93f6beff6..8a280ab3ed49 100644 --- a/hw/arm/boot.c +++ b/hw/arm/boot.c @@ -1109,7 +1109,7 @@ static void arm_setup_direct_kernel_boot(ARMCPU *cpu, info->initrd_filename); exit(1); } - if (info->initrd_start + initrd_size > info->ram_size) { + if (info->initrd_start + initrd_size > ram_end) { error_report("could not load initrd '%s': " "too big to fit into RAM after the kernel", info->initrd_filename); --=20 2.20.1