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 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 AF123C433DF for ; Thu, 6 Aug 2020 23:39:41 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id B336D21744 for ; Thu, 6 Aug 2020 23:39:41 +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="q9P/FZV0"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="+HS39mQ4" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726683AbgHFXjj (ORCPT ); Thu, 6 Aug 2020 19:39:39 -0400 Received: from Galois.linutronix.de ([193.142.43.55]:60990 "EHLO galois.linutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726645AbgHFXjD (ORCPT ); Thu, 6 Aug 2020 19:39:03 -0400 Date: Thu, 06 Aug 2020 23:39:00 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1596757141; 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=tbGZi1eZc6TtzevOnBf91sbjHgLai7dijbdLr8UQ+Dg=; b=q9P/FZV0juIRExkQCl4w1lu+de/IDSfo1dUA3mT7YT2hViIz43cI8rvX+TGifod/GjyfaC EBUwIQYiulR+vbdyLGH9JQnIdjkSC9wwxU/aVBmxxY1tj4xi8Cu/thDj2O5uiwAjjnyEBb 8CfxfLDZz+n6wKyGeEFdZ3MwF9JS3y/Hovt4rF3HU0Kzork+v1+kkSW2JFHUzlNTMKIakq iv9Cc26tZcum7I58qreDCGHE9nu1Q8PIjUlRIyDa2I/bDPotCYeN30Z2IKEN0Tg+il9Xs5 oHNKG/MdwcvFn9DMsIDght93bOvZUVU8LuIOwVX00v/9PnEGOAdOxMaeAc2iog== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1596757141; 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=tbGZi1eZc6TtzevOnBf91sbjHgLai7dijbdLr8UQ+Dg=; b=+HS39mQ4AEnUOjIO/qRz7wR5w+Zc14cbj2ZNwCqfM72s2HW4E9ZpEHuyK4DKBdA2igolw5 L8POtghZdCJTY3Cg== 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 off-by-one error in __process_mem_region() Cc: Arvind Sankar , Ingo Molnar , x86 , LKML In-Reply-To: <20200728225722.67457-6-nivedita@alum.mit.edu> References: <20200728225722.67457-6-nivedita@alum.mit.edu> MIME-Version: 1.0 Message-ID: <159675714094.3192.4263482900685835481.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: 8d1cf8595860f4807f4ff1f8f1fc53e7576e0d71 Gitweb: https://git.kernel.org/tip/8d1cf8595860f4807f4ff1f8f1fc53e7576e0d71 Author: Arvind Sankar AuthorDate: Tue, 28 Jul 2020 18:57:06 -04:00 Committer: Ingo Molnar CommitterDate: Fri, 31 Jul 2020 11:08:17 +02:00 x86/kaslr: Fix off-by-one error in __process_mem_region() In case of an overlap, the beginning of the region should be used even if it is exactly image_size, not just strictly larger. Signed-off-by: Arvind Sankar Signed-off-by: Ingo Molnar Link: https://lore.kernel.org/r/20200728225722.67457-6-nivedita@alum.mit.edu --- arch/x86/boot/compressed/kaslr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/boot/compressed/kaslr.c b/arch/x86/boot/compressed/kaslr.c index da45e66..848346f 100644 --- a/arch/x86/boot/compressed/kaslr.c +++ b/arch/x86/boot/compressed/kaslr.c @@ -669,7 +669,7 @@ static void __process_mem_region(struct mem_vector *entry, } /* Store beginning of region if holds at least image_size. */ - if (overlap.start > region.start + image_size) { + if (overlap.start >= region.start + image_size) { struct mem_vector beginning; beginning.start = region.start;