From patchwork Thu Jul 5 17:00:49 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 9863 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id DCAE823E1B for ; Thu, 5 Jul 2012 17:00:59 +0000 (UTC) Received: from mail-gg0-f180.google.com (mail-gg0-f180.google.com [209.85.161.180]) by fiordland.canonical.com (Postfix) with ESMTP id ACD69A187E8 for ; Thu, 5 Jul 2012 17:00:59 +0000 (UTC) Received: by mail-gg0-f180.google.com with SMTP id f1so8256960ggn.11 for ; Thu, 05 Jul 2012 10:00:59 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-forwarded-to:x-forwarded-for:delivered-to:received-spf:from:to:cc :subject:date:message-id:x-mailer:in-reply-to:references :x-gm-message-state; bh=gE+BQLfLfgNdvFdlhPprpnyrFB46/6/xH5KHeeSZHa4=; b=Mxt0kDJ7QK+RkpezfwLDPogxyD3I+fai2A8cUNNnn3JT3R558T1N6xmetmdnF9DB7u sPywt/nEUJmgkvYxWBd2QSOuUjdDNSFz1RHjVMVamfwAzRB4+8T5ZGqHdzlfAyrvDJAF NT/80bBE07HFqmb4yUzchyzkkkSlrUj0wnFCD3StQRkbgskiVdmDcpx6R87gfgV2/P12 K52wOFMQddeAt+OyOw/SBmmgCMv5VJNUjs3BQU0FumHcfSRwQkiJ8CHnNW5/cB/BUX8O z7VyQzFEMJD1v/b99tJwuir76k1xMwALY8TxurEeISBxjdzT4h4IqXPt8Lju3qa2xsaZ bmYA== Received: by 10.50.87.227 with SMTP id bb3mr300579igb.57.1341507659379; Thu, 05 Jul 2012 10:00:59 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.231.24.148 with SMTP id v20csp68401ibb; Thu, 5 Jul 2012 10:00:56 -0700 (PDT) Received: by 10.68.220.39 with SMTP id pt7mr30002784pbc.40.1341507655872; Thu, 05 Jul 2012 10:00:55 -0700 (PDT) Received: from mnementh.archaic.org.uk (mnementh.archaic.org.uk. [81.2.115.146]) by mx.google.com with ESMTPS id qd2si38885131pbb.57.2012.07.05.10.00.54 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 05 Jul 2012 10:00:55 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of pm215@archaic.org.uk designates 81.2.115.146 as permitted sender) client-ip=81.2.115.146; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of pm215@archaic.org.uk designates 81.2.115.146 as permitted sender) smtp.mail=pm215@archaic.org.uk Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.72) (envelope-from ) id 1SmpQC-0005ls-RY; Thu, 05 Jul 2012 18:00:52 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Cc: patches@linaro.org, Peter Crosthwaite Subject: [PATCH 3/6] hw/arm_boot.c: Check for RAM sizes exceeding ATAGS capacity Date: Thu, 5 Jul 2012 18:00:49 +0100 Message-Id: <1341507652-22155-4-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.2.5 In-Reply-To: <1341507652-22155-1-git-send-email-peter.maydell@linaro.org> References: <1341507652-22155-1-git-send-email-peter.maydell@linaro.org> X-Gm-Message-State: ALoCoQmnz6l2VVFRhmq4RD12XUVLFJ/dPliwuKepuVUY/7eliHYVh7fWkBTyakcvIns/uI7ioNmt The legacy ATAGS format for passing information to the kernel only allows RAM sizes which fit in 32 bits; enforce this restriction rather than silently doing something weird. Signed-off-by: Peter Maydell --- hw/arm_boot.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/hw/arm_boot.c b/hw/arm_boot.c index 29ae324..7366427 100644 --- a/hw/arm_boot.c +++ b/hw/arm_boot.c @@ -399,6 +399,11 @@ void arm_load_kernel(ARMCPU *cpu, struct arm_boot_info *info) bootloader[5] = dtb_start; } else { bootloader[5] = info->loader_start + KERNEL_ARGS_ADDR; + if (info->ram_size >= (1ULL << 32)) { + fprintf(stderr, "qemu: RAM size must be less than 4GB to boot" + " Linux kernel without device tree\n"); + exit(1); + } } bootloader[6] = entry; for (n = 0; n < sizeof(bootloader) / 4; n++) {