diff options
| author |   Thomas Garnier <thgarnie@google.com> | 2017-09-07 08:30:45 -0700 |
|---|---|---|
| committer |   Thomas Gleixner <tglx@linutronix.de> | 2017-09-17 19:45:33 +0200 |
| commit | 2404269bc4e77a67875c8db6667be34c9913c96e (patch) | |
| tree | 27ea04a96e9606b537ff442d6831f4670c9dafd3 /arch/arm/kernel/signal.c | |
| parent | syscalls: Use CHECK_DATA_CORRUPTION for addr_limit_user_check (diff) | |
| download | linux-dev-2404269bc4e77a67875c8db6667be34c9913c96e.tar.xz linux-dev-2404269bc4e77a67875c8db6667be34c9913c96e.zip | |
Revert "arm/syscalls: Check address limit on user-mode return"
This reverts commit 73ac5d6a2b6ac3ae8d1e1818f3e9946f97489bc9.
The work pending loop can call set_fs after addr_limit_user_check
removed the _TIF_FSCHECK flag. This may happen at anytime based on how
ARM handles alignment exceptions. It leads to an infinite loop condition.
After discussion, it has been agreed that the generic approach is not
tailored to the ARM architecture and any fix might not be complete. This
patch will be replaced by an architecture specific implementation. The
work flag approach will be kept for other architectures.
Reported-by: Leonard Crestez <leonard.crestez@nxp.com>
Signed-off-by: Thomas Garnier <thgarnie@google.com>
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Pratyush Anand <panand@redhat.com>
Cc: Dave Martin <Dave.Martin@arm.com>
Cc: Will Drewry <wad@chromium.org>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Will Deacon <will.deacon@arm.com>
Cc: Russell King <linux@armlinux.org.uk>
Cc: Andy Lutomirski <luto@amacapital.net>
Cc: David Howells <dhowells@redhat.com>
Cc: Dave Hansen <dave.hansen@intel.com>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Cc: linux-api@vger.kernel.org
Cc: Yonghong Song <yhs@fb.com>
Cc: linux-arm-kernel@lists.infradead.org
Link: http://lkml.kernel.org/r/1504798247-48833-3-git-send-email-keescook@chromium.org
Diffstat (limited to '')
| -rw-r--r-- | arch/arm/kernel/signal.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/arch/arm/kernel/signal.c b/arch/arm/kernel/signal.c index e2de50bf8742..5814298ef0b7 100644 --- a/arch/arm/kernel/signal.c +++ b/arch/arm/kernel/signal.c @@ -14,7 +14,6 @@ #include <linux/uaccess.h> #include <linux/tracehook.h> #include <linux/uprobes.h> -#include <linux/syscalls.h> #include <asm/elf.h> #include <asm/cacheflush.h> @@ -614,10 +613,6 @@ do_work_pending(struct pt_regs *regs, unsigned int thread_flags, int syscall) * Update the trace code with the current status. */ trace_hardirqs_off(); - - /* Check valid user FS if needed */ - addr_limit_user_check(); - do { if (likely(thread_flags & _TIF_NEED_RESCHED)) { schedule(); |