[PATCH v2 11/10] ARM: fix swp-emulate
From: Russell King <hidden>
Date: 2015-08-25 16:37:49
Subsystem:
arm port, the rest · Maintainers:
Russell King, Linus Torvalds
Signed-off-by: Russell King <redacted> --- Local testing found this direct userspace access from the kernel. I'll be rolling this into patch 10 tomorrow, but for the time being I'm adding it on top of the set. arch/arm/kernel/swp_emulate.c | 3 +++ 1 file changed, 3 insertions(+)
diff --git a/arch/arm/kernel/swp_emulate.c b/arch/arm/kernel/swp_emulate.c
index 1361756782c7..5b26e7efa9ea 100644
--- a/arch/arm/kernel/swp_emulate.c
+++ b/arch/arm/kernel/swp_emulate.c@@ -141,11 +141,14 @@ static int emulate_swpX(unsigned int address, unsigned int *data, while (1) { unsigned long temp; + unsigned int __ua_flags; + __ua_flags = uaccess_save_and_enable(); if (type == TYPE_SWPB) __user_swpb_asm(*data, address, res, temp); else __user_swp_asm(*data, address, res, temp); + uaccess_restore(__ua_flags); if (likely(res != -EAGAIN) || signal_pending(current)) break;
--
2.1.0