Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 31b1e940 authored by Christopher Covington's avatar Christopher Covington Committed by Catalin Marinas
Browse files

arm64: Fix __range_ok macro 



Without this, the following scenario is incorrectly determined
to be invalid.

addr 0x7f_ffffe000 size 8192 addr_limit 0x80_00000000

This behavior was observed while trying to vmsplice the stack
as part of a CRIU dump of a process on a system started with the
norandmaps kernel parameter.

Signed-off-by: default avatarChristopher Covington <cov@codeaurora.org>
Signed-off-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
parent 74397174

arch/arm64/include/asm/uaccess.h

+2 −2
Original line number Diff line number Diff line
@@ -83,7 +83,7 @@ static inline void set_fs(mm_segment_t fs) 
 * Returns 1 if the range is valid, 0 otherwise.

 *

 * This is equivalent to the following test:

 * (u65)addr + (u65)size < (u65)current->addr_limit

 * (u65)addr + (u65)size <= current->addr_limit

 *

 * This needs 65-bit arithmetic.

 */
@@ -91,7 +91,7 @@ static inline void set_fs(mm_segment_t fs) 
({									\

	unsigned long flag, roksum;					\

	__chk_user_ptr(addr);						\

	asm("adds %1, %1, %3; ccmp %1, %4, #2, cc; cset %0, cc"		\

	asm("adds %1, %1, %3; ccmp %1, %4, #2, cc; cset %0, ls"		\

		: "=&r" (flag), "=&r" (roksum)				\

		: "1" (addr), "Ir" (size),				\

		  "r" (current_thread_info()->addr_limit)		\