| From 4833ce06e6855d526234618b746ffb71d6612c9a Mon Sep 17 00:00:00 2001 |
| From: Christophe Leroy <christophe.leroy@c-s.fr> |
| Date: Mon, 20 Apr 2020 07:47:05 +0000 |
| Subject: powerpc/32s: Fix build failure with CONFIG_PPC_KUAP_DEBUG |
| |
| From: Christophe Leroy <christophe.leroy@c-s.fr> |
| |
| commit 4833ce06e6855d526234618b746ffb71d6612c9a upstream. |
| |
| gpr2 is not a parametre of kuap_check(), it doesn't exist. |
| |
| Use gpr instead. |
| |
| Fixes: a68c31fc01ef ("powerpc/32s: Implement Kernel Userspace Access Protection") |
| Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr> |
| Signed-off-by: Michael Ellerman <mpe@ellerman.id.au> |
| Cc: stable@vger.kernel.org |
| Link: https://lore.kernel.org/r/ea599546f2a7771bde551393889e44e6b2632332.1587368807.git.christophe.leroy@c-s.fr |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| arch/powerpc/include/asm/book3s/32/kup.h | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| --- a/arch/powerpc/include/asm/book3s/32/kup.h |
| +++ b/arch/powerpc/include/asm/book3s/32/kup.h |
| @@ -75,7 +75,7 @@ |
| |
| .macro kuap_check current, gpr |
| #ifdef CONFIG_PPC_KUAP_DEBUG |
| - lwz \gpr2, KUAP(thread) |
| + lwz \gpr, KUAP(thread) |
| 999: twnei \gpr, 0 |
| EMIT_BUG_ENTRY 999b, __FILE__, __LINE__, (BUGFLAG_WARNING | BUGFLAG_ONCE) |
| #endif |
