From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 09EE731F9B4 for ; Fri, 11 Sep 2026 01:13:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789089182; cv=none; b=eWzr0rhaY0cddFRRA1gnzEBMl/i4n3VvvEDPInBhdFWcvoxv8CFbTB3Z54E6hVjHrrZZt16PWBGO+IpAU6WDc2bLRUdu5AVAYEafyLU/0pcURi7oDLnsRle2OnpQMUvkd+NIKsBbbAjgqU9QB7XqFPmWtjhP4Mh2IYwq2LvZOi0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789089182; c=relaxed/simple; bh=sfqV9dyhAwavs/DpfGPF3QwW1Fj83A1G/WoVNxSGvKo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=hpeV/ACu4L4iip1grgz86IHCNUHss6EPtVH4Cj7eSISVNG4KJl/vNFThqU3fonKjwJBIWN08q70ORSN07wFzAW4+Tig1ZEaf9TaRf9mJf3rVrJJXhs62JjC04TtQYgbNSjPpAO25EWEiaJmHRekuWYF/5DaWmeFDg2sCpXCRRcY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=nOt0ECum; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="nOt0ECum" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1644B1F00898; Fri, 11 Sep 2026 01:13:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1789089180; bh=cckJhOTmEzD7dl1sJxjHwgEu2nPGJezY56oi89JEALY=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=nOt0ECumMWbIOOlHOZpVSwWXMxXFBtFjbCKBeAMganHQTfTeO8ORpA7+w2T3XTufd 1p1qXylF+YGc+Kzr3wZOmavWUl0LacTRFZHcGYRFQE/zgjUGN/z8PJAT44N5VczK/i W7WXTnta3YRzzQSiXsZ6uxYeShf+GqPS1lE1xFe0+icU+v3S+F9XmXi6xbSc4fUMZ6 bERyLScWccbqlUCZdkJewGU3OwA/snDhfVbdbmNwB5O3ioaxIrmMvS+9vTJ1HGu3g8 8gvFYhNSEr3C4xBJlHHOjt1cmvf/cxTYJvGGINXGwnhhfX9IBB7YDRXfQb2s5GeVlI xaH84IwVF57Kg== From: Sasha Levin To: stable@vger.kernel.org Cc: Jinjie Ruan , Sourabh Jain , Madhavan Srinivasan , Sasha Levin Subject: [PATCH 6.6.y 3/3] powerpc/kexec_file: Prevent kexec range truncation Date: Thu, 10 Sep 2026 21:12:56 -0400 Message-ID: <20260911011256.4032346-3-sashal@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260911011256.4032346-1-sashal@kernel.org> References: <2026090924-deskwork-unvocal-d17e@gregkh> <20260911011256.4032346-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Jinjie Ruan [ Upstream commit fa40f9dbdd4af53e7445d9135b5b207eb8adf372 ] Sashiko AI review pointed out the following issue. The __merge_memory_ranges() function incorrectly handles overlapping memory ranges when merging them. Although sort_memory_ranges() sorts all ranges by their start address in ascending order beforehand, the merge logic remains defective in two ways: 1. It compares the current range's start against the previous element (i-1) instead of the running target index (idx) 2. It unconditionally overwrites 'ranges[idx].end' with 'ranges[i].end'. This logic flaw leads to critical memory truncation when a larger memory range completely subsumes subsequent smaller ranges. For example, consider a sorted input array with three ranges: Range A (idx=0): [0x1000 - 0x9000] Range B (i=1): [0x2000 - 0x5000] (completely inside Range A) Range C (i=2): [0x6000 - 0x8000] (completely inside Range A) 1. When i=1 (Range B): ranges[1].start (0x2000) <= ranges[0].end + 1 (0x9001) is TRUE. The code executes: ranges[0].end = ranges[1].end, which erroneously shrinks Range A's end from 0x9000 down to 0x5000. 2. When i=2 (Range C): ranges[2].start (0x6000) <= ranges[1].end + 1 (0x5001) is FALSE. The code falls into the else block, creating a broken new range. As a result, valid memory fragments [0x5001 - 0x5fff] and [0x8001 - 0x9000] are completely lost from the kexec exclude lists, potentially allowing the crash kernel to overwrite active memory, causing data corruption or crashes. Fix this by ensuring the start of the current range is compared against the end of the active merged range (idx), and use max() to safely prevent the outer boundary from being truncated. Cc: stable@vger.kernel.org Fixes: 180adfc532a8 ("powerpc/kexec_file: Add helper functions for getting memory ranges") Signed-off-by: Jinjie Ruan Reviewed-by: Sourabh Jain Signed-off-by: Madhavan Srinivasan Link: https://patch.msgid.link/20260729012948.2797865-4-ruanjinjie@huawei.com Signed-off-by: Sasha Levin --- arch/powerpc/kexec/ranges.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/arch/powerpc/kexec/ranges.c b/arch/powerpc/kexec/ranges.c index 297b8bc97b9f6..5015e785f6a80 100644 --- a/arch/powerpc/kexec/ranges.c +++ b/arch/powerpc/kexec/ranges.c @@ -21,6 +21,7 @@ #include #include #include +#include #include #include #include @@ -105,19 +106,16 @@ static void __merge_memory_ranges(struct crash_mem *mem_rngs) struct range *ranges; int i, idx; - if (!mem_rngs) + if (!mem_rngs || mem_rngs->nr_ranges <= 1) return; idx = 0; - ranges = &(mem_rngs->ranges[0]); + ranges = mem_rngs->ranges; for (i = 1; i < mem_rngs->nr_ranges; i++) { - if (ranges[i].start <= (ranges[i-1].end + 1)) - ranges[idx].end = ranges[i].end; + if (ranges[i].start <= (ranges[idx].end + 1)) + ranges[idx].end = max(ranges[idx].end, ranges[i].end); else { idx++; - if (i == idx) - continue; - ranges[idx] = ranges[i]; } } -- 2.53.0