summaryrefslogtreecommitdiffstats
path: root/kernel/events
diff options
context:
space:
mode:
authorAndy Lutomirski <luto@amacapital.net>2014-11-21 13:26:07 -0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-12-06 15:05:46 -0800
commit0061b518b1b85224bd697f2474d72b18b67a8d53 (patch)
tree2841996ee43966711e6ff4dcf1c5fe1a54cff088 /kernel/events
parent0b15c16c4f4a7c62c3c0f99b7ef8ddfcdab2ae66 (diff)
downloadlinux-stable-0061b518b1b85224bd697f2474d72b18b67a8d53.tar.gz
linux-stable-0061b518b1b85224bd697f2474d72b18b67a8d53.tar.bz2
linux-stable-0061b518b1b85224bd697f2474d72b18b67a8d53.zip
uprobes, x86: Fix _TIF_UPROBE vs _TIF_NOTIFY_RESUME
commit 82975bc6a6df743b9a01810fb32cb65d0ec5d60b upstream. x86 call do_notify_resume on paranoid returns if TIF_UPROBE is set but not on non-paranoid returns. I suspect that this is a mistake and that the code only works because int3 is paranoid. Setting _TIF_NOTIFY_RESUME in the uprobe code was probably a workaround for the x86 bug. With that bug fixed, we can remove _TIF_NOTIFY_RESUME from the uprobes code. Reported-by: Oleg Nesterov <oleg@redhat.com> Acked-by: Srikar Dronamraju <srikar@linux.vnet.ibm.com> Acked-by: Borislav Petkov <bp@suse.de> Signed-off-by: Andy Lutomirski <luto@amacapital.net> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'kernel/events')
-rw-r--r--kernel/events/uprobes.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/kernel/events/uprobes.c b/kernel/events/uprobes.c
index ad8e1bdca70e..8176caf6efd9 100644
--- a/kernel/events/uprobes.c
+++ b/kernel/events/uprobes.c
@@ -1511,7 +1511,6 @@ bool uprobe_deny_signal(void)
if (__fatal_signal_pending(t) || arch_uprobe_xol_was_trapped(t)) {
utask->state = UTASK_SSTEP_TRAPPED;
set_tsk_thread_flag(t, TIF_UPROBE);
- set_tsk_thread_flag(t, TIF_NOTIFY_RESUME);
}
}