From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 321CEC77B7A for ; Wed, 31 May 2023 13:43:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236595AbjEaNnW (ORCPT ); Wed, 31 May 2023 09:43:22 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55064 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235773AbjEaNmd (ORCPT ); Wed, 31 May 2023 09:42:33 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 64E85E62; Wed, 31 May 2023 06:41:38 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 813F863B05; Wed, 31 May 2023 13:41:37 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 16E54C433EF; Wed, 31 May 2023 13:41:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1685540497; bh=apa5LjQUCPwHfND7dLxHBsRZpGi5SwgtmBlh59yV+Bw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=lVslzGxFXpIMGi6lRIq2C630HyxPTEAaiDLs0kAUmGJBYdo9fKyLRb/iaHfTikthF Ao2SLjqmuQUJdnRzT1Gy40PPEfXEsKiDrNzOlbRrzbM2VK97otkaeo/j8fuGq1Rd7V wshbOLqMY5gyYrEgNhkgx76DTQgb6A6LLhQPyk4sEiUiGCDUO4TpC7em2lKH39Gd38 eALeoGocPl9gWeg4Sn7IQilMoz33fTftN79hbwua8IG/LZsMgdJae6rSxGllYNdBMM nUxajsVTcQ6Lq8WGXZg367CF1rIm8MO4VRYOQJHWqxNTVV2zvy4i1nDWjqqNlPi0ZT nAp0rCdnTPgmA== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Liviu Dudau , Thomas Bogendoerfer , Sasha Levin , yury.norov@gmail.com, nathan@kernel.org, Jason@zx2c4.com, linux-mips@vger.kernel.org Subject: [PATCH AUTOSEL 6.3 31/37] mips: Move initrd_start check after initrd address sanitisation. Date: Wed, 31 May 2023 09:40:13 -0400 Message-Id: <20230531134020.3383253-31-sashal@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230531134020.3383253-1-sashal@kernel.org> References: <20230531134020.3383253-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Liviu Dudau [ Upstream commit 4897a898a216058dec55e5e5902534e6e224fcdf ] PAGE_OFFSET is technically a virtual address so when checking the value of initrd_start against it we should make sure that it has been sanitised from the values passed by the bootloader. Without this change, even with a bootloader that passes correct addresses for an initrd, we are failing to load it on MT7621 boards, for example. Signed-off-by: Liviu Dudau Signed-off-by: Thomas Bogendoerfer Signed-off-by: Sasha Levin --- arch/mips/kernel/setup.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/arch/mips/kernel/setup.c b/arch/mips/kernel/setup.c index f1c88f8a1dc51..81dbb4ef52317 100644 --- a/arch/mips/kernel/setup.c +++ b/arch/mips/kernel/setup.c @@ -158,10 +158,6 @@ static unsigned long __init init_initrd(void) pr_err("initrd start must be page aligned\n"); goto disable; } - if (initrd_start < PAGE_OFFSET) { - pr_err("initrd start < PAGE_OFFSET\n"); - goto disable; - } /* * Sanitize initrd addresses. For example firmware @@ -174,6 +170,11 @@ static unsigned long __init init_initrd(void) initrd_end = (unsigned long)__va(end); initrd_start = (unsigned long)__va(__pa(initrd_start)); + if (initrd_start < PAGE_OFFSET) { + pr_err("initrd start < PAGE_OFFSET\n"); + goto disable; + } + ROOT_DEV = Root_RAM0; return PFN_UP(end); disable: -- 2.39.2