Skip to content

Commit f20e32f

Browse files
t-8chjmberg-intel
authored andcommitted
um: Remove __access_ok_vsyscall()
FIXADDR_USER_START and FIXADDR_USER_END are now always zero. Signed-off-by: Thomas Weißschuh <linux@weissschuh.net> Link: https://patch.msgid.link/20251028-uml-remove-32bit-pseudo-vdso-v1-8-e930063eff5f@weissschuh.net Signed-off-by: Johannes Berg <johannes.berg@intel.com>
1 parent 880f615 commit f20e32f

1 file changed

Lines changed: 1 addition & 7 deletions

File tree

arch/um/include/asm/uaccess.h

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,6 @@
1515
(((unsigned long) (addr) < TASK_SIZE) && \
1616
(((unsigned long) (addr) + (size)) < TASK_SIZE))
1717

18-
#define __access_ok_vsyscall(addr, size) \
19-
(((unsigned long) (addr) >= FIXADDR_USER_START) && \
20-
((unsigned long) (addr) + (size) <= FIXADDR_USER_END))
21-
2218
#define __addr_range_nowrap(addr, size) \
2319
((unsigned long) (addr) <= ((unsigned long) (addr) + (size)))
2420

@@ -39,9 +35,7 @@ static inline int __access_ok(const void __user *ptr, unsigned long size);
3935
static inline int __access_ok(const void __user *ptr, unsigned long size)
4036
{
4137
unsigned long addr = (unsigned long)ptr;
42-
return __addr_range_nowrap(addr, size) &&
43-
(__under_task_size(addr, size) ||
44-
__access_ok_vsyscall(addr, size));
38+
return __addr_range_nowrap(addr, size) && __under_task_size(addr, size);
4539
}
4640

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

0 commit comments

Comments
 (0)