linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] arm64/pageattr: Propagate return value from __change_memory_common
@ 2025-11-03  6:13 Dev Jain
  2025-11-03  7:48 ` Anshuman Khandual
  2025-11-03 15:16 ` Will Deacon
  0 siblings, 2 replies; 22+ messages in thread
From: Dev Jain @ 2025-11-03  6:13 UTC (permalink / raw)
  To: catalin.marinas, will
  Cc: ryan.roberts, rppt, shijie, yang, linux-arm-kernel, linux-kernel,
	Dev Jain, stable

Post a166563e7ec3 ("arm64: mm: support large block mapping when rodata=full"),
__change_memory_common has a real chance of failing due to split failure.
Before that commit, this line was introduced in c55191e96caa, still having
a chance of failing if it needs to allocate pagetable memory in
apply_to_page_range, although that has never been observed to be true.
In general, we should always propagate the return value to the caller.

Cc: stable@vger.kernel.org
Fixes: c55191e96caa ("arm64: mm: apply r/o permissions of VM areas to its linear alias as well")
Signed-off-by: Dev Jain <dev.jain@arm.com>
---
Based on Linux 6.18-rc4.

 arch/arm64/mm/pageattr.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/arch/arm64/mm/pageattr.c b/arch/arm64/mm/pageattr.c
index 5135f2d66958..b4ea86cd3a71 100644
--- a/arch/arm64/mm/pageattr.c
+++ b/arch/arm64/mm/pageattr.c
@@ -148,6 +148,7 @@ static int change_memory_common(unsigned long addr, int numpages,
 	unsigned long size = PAGE_SIZE * numpages;
 	unsigned long end = start + size;
 	struct vm_struct *area;
+	int ret;
 	int i;
 
 	if (!PAGE_ALIGNED(addr)) {
@@ -185,8 +186,10 @@ static int change_memory_common(unsigned long addr, int numpages,
 	if (rodata_full && (pgprot_val(set_mask) == PTE_RDONLY ||
 			    pgprot_val(clear_mask) == PTE_RDONLY)) {
 		for (i = 0; i < area->nr_pages; i++) {
-			__change_memory_common((u64)page_address(area->pages[i]),
+			ret = __change_memory_common((u64)page_address(area->pages[i]),
 					       PAGE_SIZE, set_mask, clear_mask);
+			if (ret)
+				return ret;
 		}
 	}
 
-- 
2.30.2



^ permalink raw reply related	[flat|nested] 22+ messages in thread

end of thread, other threads:[~2025-11-12  6:00 UTC | newest]

Thread overview: 22+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-11-03  6:13 [PATCH] arm64/pageattr: Propagate return value from __change_memory_common Dev Jain
2025-11-03  7:48 ` Anshuman Khandual
2025-11-03  8:34   ` Dev Jain
2025-11-03 15:16 ` Will Deacon
2025-11-03 18:45   ` Yang Shi
2025-11-04  3:36     ` Dev Jain
2025-11-04 12:56       ` Will Deacon
2025-11-04 13:22         ` Dev Jain
2025-11-05  3:57         ` Dev Jain
2025-11-11  3:39           ` Dev Jain
2025-11-11  4:17             ` Yang Shi
2025-11-11  4:37               ` Dev Jain
2025-11-11  4:44                 ` Yang Shi
2025-11-11  4:55                   ` Dev Jain
2025-11-11  5:08                     ` Yang Shi
2025-11-11  5:12                       ` Dev Jain
2025-11-11 17:52                         ` Ryan Roberts
2025-11-11 23:59                           ` Yang Shi
2025-11-12  3:50                           ` Dev Jain
2025-11-11 23:45                         ` Yang Shi
2025-11-12  3:47                           ` Dev Jain
2025-11-12  5:59                 ` Dev Jain

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).