diff options
| author | Michael Ellerman <mpe@ellerman.id.au> | 2020-02-01 21:47:17 +1100 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2020-02-01 21:47:17 +1100 |
| commit | 4c25df5640ae6e4491ee2c50d3f70c1559ef037d (patch) | |
| tree | 9d68b0361918926d7d7b6d78090dcfb942ec4e72 /arch/powerpc/mm/fault.c | |
| parent | 34b5a946a9543ce38d8ad1aacc4362533a813db7 (diff) | |
| parent | 3d7dfd632f9b60cfce069b4da517e6b1a1c3f613 (diff) | |
| download | linux-4c25df5640ae6e4491ee2c50d3f70c1559ef037d.tar.bz2 | |
Merge branch 'topic/user-access-begin' into next
Merge the user_access_begin() series from Christophe. This is based on
a commit from Linus that went into v5.5-rc7.
Diffstat (limited to 'arch/powerpc/mm/fault.c')
| -rw-r--r-- | arch/powerpc/mm/fault.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/mm/fault.c b/arch/powerpc/mm/fault.c index 7534ee5bf9b2..8db0507619e2 100644 --- a/arch/powerpc/mm/fault.c +++ b/arch/powerpc/mm/fault.c @@ -233,7 +233,7 @@ static bool bad_kernel_fault(struct pt_regs *regs, unsigned long error_code, // Read/write fault in a valid region (the exception table search passed // above), but blocked by KUAP is bad, it can never succeed. - if (bad_kuap_fault(regs, is_write)) + if (bad_kuap_fault(regs, address, is_write)) return true; // What's left? Kernel fault on user in well defined regions (extable |