Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2025-01-01 15:51:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

uprobes: Remove check for uprobe variable in handle_swbp()

Browse Source 
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>
This commit is contained in:
Sebastian Andrzej Siewior 2012-08-07 18:12:30 +02:00 committed by Oleg Nesterov
parent 61e1d39498
commit 8bd874456e
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
kernel/events/uprobes.c
View File

@ -1516,17 +1516,15 @@ cleanup_ret:
utask->active_uprobe = NULL; utask->active_uprobe = NULL;
utask->state = UTASK_RUNNING; utask->state = UTASK_RUNNING;
} }
if (uprobe) { if (!(uprobe->flags & UPROBE_SKIP_SSTEP))
if (!(uprobe->flags & UPROBE_SKIP_SSTEP))
/* /*
* cannot singlestep; cannot skip instruction; * cannot singlestep; cannot skip instruction;
* re-execute the instruction. * re-execute the instruction.
*/ */
instruction_pointer_set(regs, bp_vaddr); instruction_pointer_set(regs, bp_vaddr);
put_uprobe(uprobe); put_uprobe(uprobe);
}
} }
/* /*