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=-17.2 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,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 31624C433DB for ; Wed, 20 Jan 2021 16:40:26 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (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 BD7A2233E2 for ; Wed, 20 Jan 2021 16:40:25 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org BD7A2233E2 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+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=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version: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:In-Reply-To:References:List-Owner; bh=c1Hn2XjRWBpHLfKJE5YFUtdXjhoz+fzUYrZPv80fyDo=; b=D7wBxHWOVbNaTLZ25JCJysODf1 CXCEkqsoRtYjq4n0tou6Cs2aWV1TVjUWbTM3COkVSvvKtyHLA1HvtOiKWmOSGCpZS2eV6opH1Jd8f 8ClSjvwZaIdBugsZQLNI/aUwyYqySflgHJNWJ/QOEiiHJdX0yka8VuO2k5JehalfGn8dIdhVK4UrU u1RiJv1vrakXynOZY028bAP3aGMD4psp2OOdpAXyYM7LgGxCaDfGYW3vSpQ+PMTzg2Bv9Tg8Lc/oP PiN5WNozOMPB1gp3/fo+SEDD6HUjLaZs+OAvYoVGUuDXRuufIGJB1mwCq76ym+DJgjFJqYrj4qcaT i7XDI8eQ==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1l2GVX-0004Jt-5r; Wed, 20 Jan 2021 16:38:59 +0000 Received: from mail.kernel.org ([198.145.29.99]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1l2GVU-0004JR-CN for linux-arm-kernel@lists.infradead.org; Wed, 20 Jan 2021 16:38:57 +0000 Received: by mail.kernel.org (Postfix) with ESMTPSA id EE82223358; Wed, 20 Jan 2021 16:38:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1611160735; bh=iEApgplDtm8lPwRtxhGxbaMnpeicweHkW/js70sakAQ=; h=From:To:Cc:Subject:Date:From; b=BTfXwMipflxxsNXpiCjD4OOMwgi1I2IJqUhJXejc12D91hnZpUnFBpq7EMhlkjZlN LU9TjlooUNK9pZYggydItgz76/sn+AHU//ii8Ls3wRKd4/m8F+9nFM3l6CT/ns0kDm TWKziUtDF1N+DJ2flOStF94KGNg1KHTAzu+qCN1s+N4vWdLKt1A72a+1Lg9Sewz/TI cHDVMveTNzAdXeubvMSqFhD6Ts96fy7RMbcJ4cY/axptAyAS1FUFXhKChTM67m96oT G8s+PsbLwYdXDehZsxofdawpb07Nl7Uj3IdUt9L18qOy/3UG0qeJvp5DqsAul2QOy+ 0ZQUC5EAa+3YQ== From: Mark Brown To: Ard Biesheuvel Subject: [PATCH v2] efi/arm64: Update debug prints to reflect other entropy sources Date: Wed, 20 Jan 2021 16:38:10 +0000 Message-Id: <20210120163810.14973-1-broonie@kernel.org> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210120_113857_038407_C8E48E53 X-CRM114-Status: GOOD ( 14.64 ) 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-efi@vger.kernel.org, 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+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Currently the EFI stub prints a diagnostic on boot saying that KASLR will be disabled if it is unable to use the EFI RNG protocol to obtain a seed for KASLR. With the addition of support for v8.5-RNG and the SMCCC RNG protocol it is now possible for KASLR to obtain entropy even if the EFI RNG protocol is unsupported in the system, and the main kernel now explicitly says if KASLR is active itself. This can result in a boot log where the stub says KASLR has been disabled and the main kernel says that it is enabled which is confusing for users. Remove the explicit reference to KASLR from the diagnostics, the warnings are still useful as EFI is the only source of entropy the stub uses when randomizing the physical address of the kernel and the other sources may not be available. Signed-off-by: Mark Brown --- v2: Remove all reference to KASLR from the log messages and clarify physical address randomization use of the EFI RNG seed. drivers/firmware/efi/libstub/arm64-stub.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/firmware/efi/libstub/arm64-stub.c b/drivers/firmware/efi/libstub/arm64-stub.c index 22ece1ad68a8..b69d63143e0d 100644 --- a/drivers/firmware/efi/libstub/arm64-stub.c +++ b/drivers/firmware/efi/libstub/arm64-stub.c @@ -61,10 +61,10 @@ efi_status_t handle_kernel_image(unsigned long *image_addr, status = efi_get_random_bytes(sizeof(phys_seed), (u8 *)&phys_seed); if (status == EFI_NOT_FOUND) { - efi_info("EFI_RNG_PROTOCOL unavailable, KASLR will be disabled\n"); + efi_info("EFI_RNG_PROTOCOL unavailable\n"); efi_nokaslr = true; } else if (status != EFI_SUCCESS) { - efi_err("efi_get_random_bytes() failed (0x%lx), KASLR will be disabled\n", + efi_err("efi_get_random_bytes() failed (0x%lx)\n", status); efi_nokaslr = true; } -- 2.20.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel