Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
tjh.dev
kernel
os
linux
Merge tag 'powerpc-5.6-2' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux
Pull powerpc fixes from Michael Ellerman:
- Fix an existing bug in our user access handling, exposed by one of
the bug fixes we merged this cycle.
- A fix for a boot hang on 32-bit with CONFIG_TRACE_IRQFLAGS and the
recently added CONFIG_VMAP_STACK.
Thanks to: Christophe Leroy, Guenter Roeck.
* tag 'powerpc-5.6-2' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux:
powerpc: Fix CONFIG_TRACE_IRQFLAGS with CONFIG_VMAP_STACK
powerpc/futex: Fix incorrect user access blocking
+6
-4
arch/powerpc/include/asm/futex.h
+6
-4
arch/powerpc/include/asm/futex.h
···
35
35
{
36
36
int oldval = 0, ret;
37
37
38
-
allow_write_to_user(uaddr, sizeof(*uaddr));
38
+
allow_read_write_user(uaddr, uaddr, sizeof(*uaddr));
39
39
pagefault_disable();
40
40
41
41
switch (op) {
···
62
62
63
63
*oval = oldval;
64
64
65
-
prevent_write_to_user(uaddr, sizeof(*uaddr));
65
+
prevent_read_write_user(uaddr, uaddr, sizeof(*uaddr));
66
66
return ret;
67
67
}
68
68
···
76
76
if (!access_ok(uaddr, sizeof(u32)))
77
77
return -EFAULT;
78
78
79
-
allow_write_to_user(uaddr, sizeof(*uaddr));
79
+
allow_read_write_user(uaddr, uaddr, sizeof(*uaddr));
80
+
80
81
__asm__ __volatile__ (
81
82
PPC_ATOMIC_ENTRY_BARRIER
82
83
"1: lwarx %1,0,%3 # futex_atomic_cmpxchg_inatomic\n\
···
98
97
: "cc", "memory");
99
98
100
99
*uval = prev;
101
-
prevent_write_to_user(uaddr, sizeof(*uaddr));
100
+
prevent_read_write_user(uaddr, uaddr, sizeof(*uaddr));
101
+
102
102
return ret;
103
103
}
104
104
+1
-1
arch/powerpc/kernel/entry_32.S
+1
-1
arch/powerpc/kernel/entry_32.S