From patchwork Mon Nov 28 20:24:39 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Herring X-Patchwork-Id: 26951 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp5925005wrr; Mon, 28 Nov 2022 12:25:50 -0800 (PST) X-Google-Smtp-Source: AA0mqf7JUszPWZyN4SBm2MSjexOOfCcKGwZ9IRfxaQERvdqCarX+ytBz80Lo6EMjOfu1hkMDgJgR X-Received: by 2002:a62:6247:0:b0:56b:eda9:f47a with SMTP id w68-20020a626247000000b0056beda9f47amr36049159pfb.84.1669667150622; Mon, 28 Nov 2022 12:25:50 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669667150; cv=none; d=google.com; s=arc-20160816; b=keXeFN1ORwENOe2wPyHaMSyGFpaW8zFnrMgd08737seTp/WzJVYJ+SABn+lY9GShYk 3La8ZqXpJoKCOMl+akTFMvrDPzKoH7sxbCDKCXVUYEb/TBLmKsx8H5ioRLpynogVFt/x cG0guMd1HOdzym9Hk0Fbjn7J5dijNVpQjMeicf9T1cb+Hy/53s91zDSZjA3eoAr1vZer 4tP6Jv5MDwSuER2BccH7Q0EhOlMXOjps+ieLgtRoVW8caVMbT2xMtQKrxQrAnWj1OXee JTfAUmSLbY014gakYwS7OU1HMQx7+calzwMOn47rXGX+B87hCIkXgt+MCIsphdj6M/CO 8IMg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from; bh=4pTJFoDZB1wvweEpaxwGsowfmcCurICeVU/vO+CpfSo=; b=gupteVJpaSDdkshWx8l4CWrqktCvV0NzDG7JtBGKQ+qJoNvgynC4g7mKFLcQcCTRZt yn762CMUMhp4FnnJV0Ceid83vR2NdZYMuXRi+P2S4hIOxxlQr3bRU8o0yGazO2pSS1f9 PmnMQSktdyO9lOZuOg1JsDebh9YRwCnkPc7C3REYqLqQAA14C1ptgQwmDPRJ4J7ZIMEx gA+fRvXHPrVeTu45QAyM9rlabu3YzYCqInK829nOz5u/+agccW6gUE8d7+6aZbacTySB BK0xYnMAgCADyMjCbdHj12aitbz/VcnfCWc+XdWXD2Zqj4Q6JyJ9UooEXCXphhM/T6Kv PVZQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id 4-20020a170902c24400b001887af39371si12121420plg.240.2022.11.28.12.25.37; Mon, 28 Nov 2022 12:25:50 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234034AbiK1UZA (ORCPT + 99 others); Mon, 28 Nov 2022 15:25:00 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37658 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233956AbiK1UY6 (ORCPT ); Mon, 28 Nov 2022 15:24:58 -0500 Received: from mail-oi1-f182.google.com (mail-oi1-f182.google.com [209.85.167.182]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7A9941A385; Mon, 28 Nov 2022 12:24:56 -0800 (PST) Received: by mail-oi1-f182.google.com with SMTP id v82so12910081oib.4; Mon, 28 Nov 2022 12:24:56 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=4pTJFoDZB1wvweEpaxwGsowfmcCurICeVU/vO+CpfSo=; b=OhFC01nC9sICvP3N4wxLeshlZ4sFfi6NBX1uOIkI56Meid1vtyDyR3xHFOv8gZrzcW GVa12MdHuWkJ8pGXQT5ojslMNdNJbQDBdFxK1JUwj3cmHCZ9hGPsBs1ayEh2z/lCt7hk 89VYcRgXNCz+d1CbARCdcfFpDZ3ZtEKc+vY9hM5OVLxtiiIADrAMWoIf6zu2STuHp/SA VABmFNZgXBRaBbXWrU7WBzxJffglCjTAxM07diDVboBkKge8WpisGdBUeGi8G2NzW+94 rZxqiWlpF05F6DfYOfvAV4PqV5n8SA5GDIuzqr2qAWaY4Z40AqBOwWdFdZ8Wv7Xdo2V0 hd/Q== X-Gm-Message-State: ANoB5pmKax7iYSJlBawTujbzb0uN1T3FT5lghTOXQzpZruUcsPBVgga+ ZTYyLcPDy4fi0Z6IlMPQf9E5cY3USQ== X-Received: by 2002:a54:4415:0:b0:35a:83c5:392e with SMTP id k21-20020a544415000000b0035a83c5392emr15573196oiw.146.1669667095760; Mon, 28 Nov 2022 12:24:55 -0800 (PST) Received: from robh_at_kernel.org (66-90-144-107.dyn.grandenetworks.net. [66.90.144.107]) by smtp.gmail.com with ESMTPSA id i38-20020a056870892600b00142fa439ee5sm6345380oao.39.2022.11.28.12.24.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Nov 2022 12:24:55 -0800 (PST) Received: (nullmailer pid 1412312 invoked by uid 1000); Mon, 28 Nov 2022 20:24:54 -0000 From: Rob Herring To: Frank Rowand Cc: Peter Maydell , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] of/kexec: Fix reading 32-bit "linux,initrd-{start,end}" values Date: Mon, 28 Nov 2022 14:24:39 -0600 Message-Id: <20221128202440.1411895-1-robh@kernel.org> X-Mailer: git-send-email 2.35.1 MIME-Version: 1.0 X-Spam-Status: No, score=-1.4 required=5.0 tests=BAYES_00, FREEMAIL_ENVFROM_END_DIGIT,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2, SPF_HELO_NONE,SPF_PASS autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1750772902036570278?= X-GMAIL-MSGID: =?utf-8?q?1750772902036570278?= "linux,initrd-start" and "linux,initrd-end" can be 32-bit values even on a 64-bit platform. Ideally, the size should be based on '#address-cells', but that has never been enforced in the kernel's FDT boot parsing code (early_init_dt_check_for_initrd()). Bootloader behavior is known to vary. For example, kexec always writes these as 64-bit. Use of_read_number() to mirror the early_init_dt_check_for_initrd() code. Reported-by: Peter Maydell Signed-off-by: Rob Herring --- drivers/of/kexec.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/of/kexec.c b/drivers/of/kexec.c index e6c01db393f9..f26d2ba8a371 100644 --- a/drivers/of/kexec.c +++ b/drivers/of/kexec.c @@ -281,7 +281,7 @@ void *of_kexec_alloc_and_setup_fdt(const struct kimage *image, const char *cmdline, size_t extra_fdt_size) { void *fdt; - int ret, chosen_node; + int ret, chosen_node, len; const void *prop; size_t fdt_size; @@ -324,19 +324,19 @@ void *of_kexec_alloc_and_setup_fdt(const struct kimage *image, goto out; /* Did we boot using an initrd? */ - prop = fdt_getprop(fdt, chosen_node, "linux,initrd-start", NULL); + prop = fdt_getprop(fdt, chosen_node, "linux,initrd-start", &len); if (prop) { u64 tmp_start, tmp_end, tmp_size; - tmp_start = fdt64_to_cpu(*((const fdt64_t *) prop)); + tmp_start = of_read_number(prop, len / 4); - prop = fdt_getprop(fdt, chosen_node, "linux,initrd-end", NULL); + prop = fdt_getprop(fdt, chosen_node, "linux,initrd-end", &len); if (!prop) { ret = -EINVAL; goto out; } - tmp_end = fdt64_to_cpu(*((const fdt64_t *) prop)); + tmp_end = of_read_number(prop, len / 4); /* * kexec reserves exact initrd size, while firmware may