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=-14.8 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, MENTIONS_GIT_HOSTING,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED 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 87DB0C433E0 for ; Thu, 6 Aug 2020 23:39:35 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 8F01921744 for ; Thu, 6 Aug 2020 23:39:35 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="WUO1ltbd"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="27kD3CyM" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726947AbgHFXjd (ORCPT ); Thu, 6 Aug 2020 19:39:33 -0400 Received: from Galois.linutronix.de ([193.142.43.55]:60966 "EHLO galois.linutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726718AbgHFXjE (ORCPT ); Thu, 6 Aug 2020 19:39:04 -0400 Date: Thu, 06 Aug 2020 23:39:02 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1596757142; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=965pAqaMzTYAjEnNgooelFyKKV0yVuFCat0tV7lH4Y4=; b=WUO1ltbdFI5+BHWlBEZVNAwWhK/L1K8LI/uddn6T3L49hu3uoVPAlQDacqyjQj8aYlPr6D nNcr6k7+vEdoBKrKiYOrnBdwbJU0TL1wPxX2RADaCgXf/HVwOpJzteESvphF0VFpHm0Slm AjvACtHcnp1esXVIqrPwB33Z4BLbxPB6oeP52oYrnnbC5wK8FYQrFt5ll/Lf4C2NOkLh+B mO+yFcGEqGHxQzpF9ByBztAFwfsm3fUSD0cxSNkmG1IHz2cgkn5IJlA50AIDW6K0ssw5UG VqUiV41LG79+/V2svNqqvfoSOL4OjnAICAkZ7Go7t6ky6UuZ9gPleY4IjYptEQ== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1596757142; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=965pAqaMzTYAjEnNgooelFyKKV0yVuFCat0tV7lH4Y4=; b=27kD3CyMqToLhGWd7PPeiJBCWj5/6QO4M8+VLufrk6AdvR4X006T08upP1wLAiYTkOLVvh PxqF8c7hz+k2raDA== From: "tip-bot2 for Arvind Sankar" Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: x86/kaslr] x86/kaslr: Fix process_efi_entries comment Cc: Arvind Sankar , Ingo Molnar , Kees Cook , x86 , LKML In-Reply-To: <20200727230801.3468620-4-nivedita@alum.mit.edu> References: <20200727230801.3468620-4-nivedita@alum.mit.edu> MIME-Version: 1.0 Message-ID: <159675714219.3192.7212574474867061776.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The following commit has been merged into the x86/kaslr branch of tip: Commit-ID: 08705365560a352d3f5b4f1f52270b4d4ff7911e Gitweb: https://git.kernel.org/tip/08705365560a352d3f5b4f1f52270b4d4ff7911e Author: Arvind Sankar AuthorDate: Mon, 27 Jul 2020 19:07:56 -04:00 Committer: Ingo Molnar CommitterDate: Fri, 31 Jul 2020 11:08:12 +02:00 x86/kaslr: Fix process_efi_entries comment Since commit: 0982adc74673 ("x86/boot/KASLR: Work around firmware bugs by excluding EFI_BOOT_SERVICES_* and EFI_LOADER_* from KASLR's choice") process_efi_entries() will return true if we have an EFI memmap, not just if it contained EFI_MEMORY_MORE_RELIABLE regions. Signed-off-by: Arvind Sankar Signed-off-by: Ingo Molnar Reviewed-by: Kees Cook Link: https://lore.kernel.org/r/20200727230801.3468620-4-nivedita@alum.mit.edu --- arch/x86/boot/compressed/kaslr.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/x86/boot/compressed/kaslr.c b/arch/x86/boot/compressed/kaslr.c index c31f3a5..1ab67a8 100644 --- a/arch/x86/boot/compressed/kaslr.c +++ b/arch/x86/boot/compressed/kaslr.c @@ -742,8 +742,8 @@ static bool process_mem_region(struct mem_vector *region, #ifdef CONFIG_EFI /* - * Returns true if mirror region found (and must have been processed - * for slots adding) + * Returns true if we processed the EFI memmap, which we prefer over the E820 + * table if it is available. */ static bool process_efi_entries(unsigned long minimum, unsigned long image_size)