Skip to contentSkip to conversation

mm: mremap - Fix extent calculation

PATCH Guenter Roeck 1 participant 1 message Dec 19, 2020 Memory management

lore
Share & tools
lore

Guenter Roeck

author Tested-by
#0 lore raw
Quoted 7 lines · Kalesh Singh

When next < old_addr, next - old_addr arithmetic underflows causing extent to be incorrect.

Make extent the smaller of next - old_addr or old_end - old_addr.

This patch fixes the problem I had observed when booting 'parisc' images.

Guenter

Quoted 22 lines
---
 mm/mremap.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
mm/mremap.c +3 -1
index c5590afe7165..f554320281cc 100644
@@ -358,7 +358,9 @@ static unsigned long get_extent(enum pgt_entry entry, unsigned long old_addr,
 
 	next = (old_addr + size) & mask;
 	/* even if next overflowed, extent below will be ok */
-	extent = (next > old_end) ? old_end - old_addr : next - old_addr;
+	extent = next - old_addr;
+	if (extent > old_end - old_addr)
+		extent = old_end - old_addr;
 	next = (new_addr + size) & mask;
 	if (extent > next - new_addr)
 		extent = next - new_addr;
Signature · 1 line
2.29.2.729.g45daf8777d-goog