From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 9990B409F0B; Sat, 28 Feb 2026 17:44:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772300660; cv=none; b=kwnMMKacIZdUppw/22rwxLZCURYTMUNj3dD1Hag/sRt1oMmYuh+KXx6SbJqPiIPKmGKfrcVjnwnl6XI7jRqg55O/zJ+MB9EA//F+fHkbNQ0i8GYcihfGFFHj1FQSmSoikDbPF/K4sof8gNHkmzkh6QguHqvZJDtAd8EYPA+Iins= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772300660; c=relaxed/simple; bh=hynepgpAQS62ggttobeYcs2o4UAKAYMz2B4KjnrM9KM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=R7G5O+nAi2UFYlr8O0gQ7Z+jwssJU511GMi5LWzVwtIM93juXZgmDIwiPWI1fg3fen4nJ2d/I6UWNKvPligpd+vyCkB8l0fdm2cUNG+rZwUe8lrITZeYXnPwFmfegGRgdJ7veRGSKrTChuKhp3USs4ppVLkvbDFzqZ3Hs9Sy55o= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=hlZkXaf7; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="hlZkXaf7" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 435E1C116D0; Sat, 28 Feb 2026 17:44:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1772300660; bh=hynepgpAQS62ggttobeYcs2o4UAKAYMz2B4KjnrM9KM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hlZkXaf7mKTJL6Zn/WVr+4AcSLnCKi/tHcUHxlcgt1ykv8I4gUBn/qVntJg2yLlAv tVA+XiYGr8y74NM1Ph9GM9cf/seLh8/Mw/YzYEZo6JokHYO2eOnfuCduG3tYVrdmI0 Sft7tmHW6ZcMIfM8iwowFOhhvvkX30ows3n5hSShrGADlJTEEq5PN0bxEyir+23vns fcSSVAnhQhtA/LgwUDTSSw/4INf0OD4z0mkAulQS0jhw9dMCiBAsRl57KBMBEl1ujj 2+X4kPyzU/r9uC/0/acr+hT52B3CynKilx+SQc6KLmj2UjkFtdaM4DYizU1Bcn4j4i yTolKFdimR+Ag== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Harshit Mogalapalli , Mimi Zohar , Alexander Graf , Ard Biesheuvel , Baoquan He , Borislav Betkov , guoweikang , Henry Willard , "H. Peter Anvin" , Ingo Molnar , Jiri Bohac , Joel Granados , Jonathan McDowell , Mike Rapoport , Paul Webb , Sohil Mehta , Sourabh Jain , Thomas Gleinxer , Yifei Liu , Andrew Morton , Sasha Levin Subject: [PATCH 6.19 699/844] of/kexec: refactor ima_get_kexec_buffer() to use ima_validate_range() Date: Sat, 28 Feb 2026 12:30:12 -0500 Message-ID: <20260228173244.1509663-700-sashal@kernel.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20260228173244.1509663-1-sashal@kernel.org> References: <20260228173244.1509663-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit From: Harshit Mogalapalli [ Upstream commit 4d02233235ed0450de9c10fcdcf3484e3c9401ce ] Refactor the OF/DT ima_get_kexec_buffer() to use a generic helper to validate the address range. No functional change intended. Link: https://lkml.kernel.org/r/20251231061609.907170-3-harshit.m.mogalapalli@oracle.com Signed-off-by: Harshit Mogalapalli Reviewed-by: Mimi Zohar Cc: Alexander Graf Cc: Ard Biesheuvel Cc: Baoquan He Cc: Borislav Betkov Cc: guoweikang Cc: Henry Willard Cc: "H. Peter Anvin" Cc: Ingo Molnar Cc: Jiri Bohac Cc: Joel Granados Cc: Jonathan McDowell Cc: Mike Rapoport Cc: Paul Webb Cc: Sohil Mehta Cc: Sourabh Jain Cc: Thomas Gleinxer Cc: Yifei Liu Cc: Signed-off-by: Andrew Morton Signed-off-by: Sasha Levin --- drivers/of/kexec.c | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/drivers/of/kexec.c b/drivers/of/kexec.c index 1ee2d31816aeb..c4cf3552c0183 100644 --- a/drivers/of/kexec.c +++ b/drivers/of/kexec.c @@ -128,7 +128,6 @@ int __init ima_get_kexec_buffer(void **addr, size_t *size) { int ret, len; unsigned long tmp_addr; - unsigned long start_pfn, end_pfn; size_t tmp_size; const void *prop; @@ -144,17 +143,9 @@ int __init ima_get_kexec_buffer(void **addr, size_t *size) if (!tmp_size) return -ENOENT; - /* - * Calculate the PFNs for the buffer and ensure - * they are with in addressable memory. - */ - start_pfn = PHYS_PFN(tmp_addr); - end_pfn = PHYS_PFN(tmp_addr + tmp_size - 1); - if (!page_is_ram(start_pfn) || !page_is_ram(end_pfn)) { - pr_warn("IMA buffer at 0x%lx, size = 0x%zx beyond memory\n", - tmp_addr, tmp_size); - return -EINVAL; - } + ret = ima_validate_range(tmp_addr, tmp_size); + if (ret) + return ret; *addr = __va(tmp_addr); *size = tmp_size; -- 2.51.0