diff options
| author | Sebastian Andrzej Siewior <bigeasy@linutronix.de> | 2012-08-07 18:12:30 +0200 |
|---|---|---|
| committer | Anton Arapov <anton@redhat.com> | 2012-10-29 11:22:03 +0100 |
| commit | e6e96b92c5a82bb7cbeed82d993eb71fee0ea3c8 (patch) | |
| tree | d0adb7a51119cb003d53ff3e3a556724af9c9bca /kernel | |
| parent | be0f7425523328dddb19addb33ee89a530bba8c8 (diff) | |
| download | kernel-uprobes-e6e96b92c5a82bb7cbeed82d993eb71fee0ea3c8.tar.gz kernel-uprobes-e6e96b92c5a82bb7cbeed82d993eb71fee0ea3c8.tar.xz kernel-uprobes-e6e96b92c5a82bb7cbeed82d993eb71fee0ea3c8.zip | |
uprobes: Remove check for uprobe variable in handle_swbp()
by the time we get here (after we pass cleanup_ret) uprobe is always is
set. If it is NULL we leave very early in the code.
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Signed-off-by: Oleg Nesterov <oleg@redhat.com>
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/events/uprobes.c | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/kernel/events/uprobes.c b/kernel/events/uprobes.c index 7cff24c60dd..0cefde27664 100644 --- a/kernel/events/uprobes.c +++ b/kernel/events/uprobes.c @@ -1516,17 +1516,15 @@ cleanup_ret: utask->active_uprobe = NULL; utask->state = UTASK_RUNNING; } - if (uprobe) { - if (!(uprobe->flags & UPROBE_SKIP_SSTEP)) + if (!(uprobe->flags & UPROBE_SKIP_SSTEP)) - /* - * cannot singlestep; cannot skip instruction; - * re-execute the instruction. - */ - instruction_pointer_set(regs, bp_vaddr); + /* + * cannot singlestep; cannot skip instruction; + * re-execute the instruction. + */ + instruction_pointer_set(regs, bp_vaddr); - put_uprobe(uprobe); - } + put_uprobe(uprobe); } /* |