Commit f20e32ff authored by Thomas Weißschuh's avatar Thomas Weißschuh Committed by Johannes Berg
Browse files

um: Remove __access_ok_vsyscall() 



FIXADDR_USER_START and FIXADDR_USER_END are now always zero.

Signed-off-by: default avatarThomas Weißschuh <linux@weissschuh.net>
Link: https://patch.msgid.link/20251028-uml-remove-32bit-pseudo-vdso-v1-8-e930063eff5f@weissschuh.net


Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 880f615b

arch/um/include/asm/uaccess.h

+1 −7
Original line number Diff line number Diff line
@@ -15,10 +15,6 @@ 
	(((unsigned long) (addr) < TASK_SIZE) && \

	 (((unsigned long) (addr) + (size)) < TASK_SIZE))



#define __access_ok_vsyscall(addr, size) \

	  (((unsigned long) (addr) >= FIXADDR_USER_START) && \

	  ((unsigned long) (addr) + (size) <= FIXADDR_USER_END))



#define __addr_range_nowrap(addr, size) \

	((unsigned long) (addr) <= ((unsigned long) (addr) + (size)))
@@ -39,9 +35,7 @@ static inline int __access_ok(const void __user *ptr, unsigned long size); 
static inline int __access_ok(const void __user *ptr, unsigned long size)

{

	unsigned long addr = (unsigned long)ptr;

	return __addr_range_nowrap(addr, size) &&

		(__under_task_size(addr, size) ||

		 __access_ok_vsyscall(addr, size));

	return __addr_range_nowrap(addr, size) && __under_task_size(addr, size);

}



#define __get_kernel_nofault(dst, src, type, err_label)			\