Merge branch 'for-3.14/core' of git://git.kernel.dk/linux-block

[~andy/linux] / kernel / events / uprobes.c

diff --git a/kernel/events/uprobes.c b/kernel/events/uprobes.c
index b886a5e7d4ff4a5d1c7b240a63aed39538926de4..307d87c0991a338fbc8038afc0784b1bd2a18b96 100644 (file)
--- a/kernel/events/uprobes.c
+++ b/kernel/events/uprobes.c
@@ -1854,6 +1854,10 @@ static void handle_swbp(struct pt_regs *regs)
        if (unlikely(!test_bit(UPROBE_COPY_INSN, &uprobe->flags)))
                goto out;
 
+       /* Tracing handlers use ->utask to communicate with fetch methods */
+       if (!get_utask())
+               goto out;
+
        handler_chain(uprobe, regs);
        if (can_skip_sstep(uprobe, regs))
                goto out;