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 X-Spam-Level: X-Spam-Status: No, score=-10.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE, SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 71864FA372C for ; Fri, 8 Nov 2019 16:20:16 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 40D8921D7F for ; Fri, 8 Nov 2019 16:20:16 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="aKN477HJ"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=sirena.org.uk header.i=@sirena.org.uk header.b="IR1HpFje" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 40D8921D7F Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=lDLoF163U7mUoVmSQc+apaocx8NLwPTxfQUrRk0PxLs=; b=aKN477HJSR5Dqe UZEsR8hiwsxZkKDL+5hxRG44vlkge40Jg2Py32LzugZyJZvyLs8jGhVh1PZ1fs1X44faziNNxIO61 1OfRUxNSFzqomQkYUlBME6AEb/Ho/Y9/UL60SYHZeWBIeJ+kUTrFZc97SEnlFnxRWZcbXcCuGX0xi eVpud2mPbeTlhFxmS8YdHI9IoAGCz811+nZ34/61OfelkQZ1QesIo4RMzZI8VgoiaAabd0iDB99DM tSz/P9RqyWSZ5blfT3zKn5T9NVbKTJNYVbI0iAuvyOibrOkom5WnjiE1aeV0wW/AK6I2AVStL5xYC ewC4LRksg+Z35YBbdFAQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1iT6za-0002L3-0m; Fri, 08 Nov 2019 16:20:10 +0000 Received: from heliosphere.sirena.org.uk ([172.104.155.198]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1iT6zV-0001n7-Rg for linux-arm-kernel@lists.infradead.org; Fri, 08 Nov 2019 16:20:07 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sirena.org.uk; s=20170815-heliosphere; h=Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender :Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From :Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=ew3ogKlXBoxc+2Xx91c/83BnYWnobgaDV0o3CeSH+Yc=; b=IR1HpFjeVv2Q9qF9u4kMXWPvcb jQ6/5NwYGUe/Xfxbus+bFC7jO8qt2lDTctRPBXll4sl75722YRFBUmbyIWTIySdQfm54el38wvV6U eX9Q+5P2R1WyyfdZwYYwNv+mTZpwu9ON5dt1ZGER6PZ9nTZSw5r3VZ/Fh6NfN2MzPyzU=; Received: from cpc102320-sgyl38-2-0-cust46.18-2.cable.virginm.net ([82.37.168.47] helo=ypsilon.sirena.org.uk) by heliosphere.sirena.org.uk with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1iT6zT-0007dt-Kz; Fri, 08 Nov 2019 16:20:03 +0000 Received: by ypsilon.sirena.org.uk (Postfix, from userid 1000) id EC6DB2741460; Fri, 8 Nov 2019 16:20:02 +0000 (GMT) From: Mark Brown To: Catalin Marinas , Will Deacon , Mark Rutland Subject: [PATCH v3 2/2] arm64: kaslr: Check command line before looking for a seed Date: Fri, 8 Nov 2019 16:20:01 +0000 Message-Id: <20191108162001.11737-3-broonie@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191108162001.11737-1-broonie@kernel.org> References: <20191108162001.11737-1-broonie@kernel.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20191108_082005_923285_CF355044 X-CRM114-Status: GOOD ( 13.75 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mark Brown , linux-arm-kernel@lists.infradead.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org Now that we print diagnostics at boot the reason why we do not initialise KASLR matters. Currently we check for a seed before we check if the user has explicitly disabled KASLR on the command line which will result in misleading diagnostics so reverse the order of those checks. We still parse the seed from the DT early so that if the user has both provided a seed and disabled KASLR on the command line we still mask the seed on the command line. Signed-off-by: Mark Brown --- arch/arm64/kernel/kaslr.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/arch/arm64/kernel/kaslr.c b/arch/arm64/kernel/kaslr.c index 0039dc50e556..c09f12ab6525 100644 --- a/arch/arm64/kernel/kaslr.c +++ b/arch/arm64/kernel/kaslr.c @@ -108,10 +108,6 @@ u64 __init kaslr_early_init(u64 dt_phys) * Retrieve (and wipe) the seed from the FDT */ seed = get_kaslr_seed(fdt); - if (!seed) { - kaslr_status = KASLR_DISABLED_NO_SEED; - return 0; - } /* * Check if 'nokaslr' appears on the command line, and @@ -124,6 +120,11 @@ u64 __init kaslr_early_init(u64 dt_phys) return 0; } + if (!seed) { + kaslr_status = KASLR_DISABLED_NO_SEED; + return 0; + } + /* * OK, so we are proceeding with KASLR enabled. Calculate a suitable * kernel image offset from the seed. Let's place the kernel in the -- 2.20.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel