[5.4.y,3/4] mm/memory.c: make remap_pfn_range() reject unaligned addr

Commit Message

Harshvardhan Jha Nov. 14, 2024, 3:34 p.m. UTC

From: Alex Zhang <[e-mail]>

commit 0c4123e3fb82d6014d0a70b52eb38153f658541c upstream

This function implicitly assumes that the addr passed in is page aligned.
A non page aligned addr could ultimately cause a kernel bug in
remap_pte_range as the exit condition in the logic loop may never be
satisfied.  This patch documents the need for the requirement, as well as
explicitly adds a check for it.

Signed-off-by: Alex Zhang <[e-mail]>
Signed-off-by: Andrew Morton <[e-mail]>
Reviewed-by: Andrew Morton <[e-mail]>
Link: http://lkml.kernel.org/r/[e-mail]
Signed-off-by: Linus Torvalds <[e-mail]>
(cherry picked from commit 0c4123e3fb82d6014d0a70b52eb38153f658541c)
Signed-off-by: Harshvardhan Jha <[e-mail]>
---
 mm/memory.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

Patch

diff --git a/mm/memory.c b/mm/memory.c
index 50503743724cc..1d009d3d87b34 100644
--- a/mm/memory.c
+++ b/mm/memory.c
@@ -1920,7 +1920,7 @@  static inline int remap_p4d_range(struct mm_struct *mm, pgd_t *pgd,
 /**
  * remap_pfn_range - remap kernel memory to userspace
  * @vma: user vma to map to
- * @addr: target user address to start at
+ * @addr: target page aligned user address to start at
  * @pfn: page frame number of kernel physical memory address
  * @size: size of mapping area
  * @prot: page protection flags for this mapping
@@ -1939,6 +1939,9 @@  int remap_pfn_range(struct vm_area_struct *vma, unsigned long addr,
 	unsigned long remap_pfn = pfn;
 	int err;
 
+	if (WARN_ON_ONCE(!PAGE_ALIGNED(addr)))
+		return -EINVAL;
+
 	/*
 	 * Physically remapped pages are special. Tell the
 	 * rest of the world about it: