From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from m16.mail.163.com (m16.mail.163.com [220.197.31.2]) (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 3873E47ECD6; Wed, 3 Jun 2026 13:05:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=220.197.31.2 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780491914; cv=none; b=UkWC0OEoKbck0/vWyJJE7MmAIKr38I3NmboJXyzTc+bZNBpGhTtftCaKJjid5y7z/RKmyWUqzwbhZ1rPNh2mh80i/eWeVEz+lACESKG9DwM8My2DUKbhOTVN5XZU/F/PVRoHKeoulyOAFWL0uOpMxBj24G6o69HGbux7LwdMP/E= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780491914; c=relaxed/simple; bh=6bvuZId+QHXtI1OBaH2b6nZswD5S7sgg3GTHgV5PfhA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=uEGUg81DhdVNUD4NyZiLk1LsxicbE1epxlf+RXFyOy72hk7MqKN1zghSXmMuYZuShf6bKLwFX7wfgnWVtOfLVdMZXByBbZe05AlFQz2wv1g56D8HOal5hr3Sl6+A8eKdyS3xO1drrjbSki0dILOLUj0YIUsAoK/DN8rrtDa66IQ= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=163.com; spf=pass smtp.mailfrom=163.com; dkim=pass (1024-bit key) header.d=163.com header.i=@163.com header.b=n5MGP/SA; arc=none smtp.client-ip=220.197.31.2 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=163.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=163.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=163.com header.i=@163.com header.b="n5MGP/SA" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:To:Subject:Date:Message-ID:MIME-Version; bh=fC e+LnD2voXqPdswcbC3PLctRfD4+jtKyh83rTK/dIc=; b=n5MGP/SAdwiGNZjY4k F5Nr5sPizs8I5KZpZOYfPmQvroyiGi3kZ/U4E6iWX68sTTxwRbGPnLRbl34g9X5i OUStOc6BC/TIZjxrO5WRJHm5KNaXbrBtDeRSCxof/hEBKz9tCXdh7TP1LOyH/fYY oTbKyHdAZ/KyGOXfW/KUdP3nA= Received: from China-163-team (unknown []) by gzga-smtp-mtada-g0-4 (Coremail) with SMTP id _____wBnoqAAJiBqWd71BA--.49866S3; Wed, 03 Jun 2026 21:03:10 +0800 (CST) From: Wenshan Lan To: gregkh@linuxfoundation.org, sashal@kernel.org, stable@vger.kernel.org Cc: linux-kernel@vger.kernel.org, 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 , Wenshan Lan Subject: [PATCH 6.6.y 2/3] of/kexec: refactor ima_get_kexec_buffer() to use ima_validate_range() Date: Wed, 3 Jun 2026 21:02:38 +0800 Message-ID: <20260603130239.81400-2-jetlan9@163.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260603130239.81400-1-jetlan9@163.com> References: <20260603130239.81400-1-jetlan9@163.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CM-TRANSID:_____wBnoqAAJiBqWd71BA--.49866S3 X-Coremail-Antispam: 1Uf129KBjvJXoW7Aw4fZFy8ZrWDXF17KF4rZrb_yoW8Kw4Dpr Wakr1xAr1xJw10gw18uFyYkFy5X3WDWryUGa9ru34vkF1rAw1UZrnY9FZ3WFy2yFyrKFW5 WF4jgw1Sgw40qrJanT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x0piWCJdUUUUU= X-CM-SenderInfo: xmhwztjqz6il2tof0z/xtbC6w4v92ogJg5haQAA3X 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: Wenshan Lan --- 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 3b98a57f1f07..23fde2d032e6 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.43.0