Messages in this thread | | | Date | Wed, 8 Aug 2012 14:58:45 +0200 | From | Oleg Nesterov <> | Subject | Re: [PATCH 3/5] uprobes: remove check for uprobe variable in handle_swbp() |
| |
On 08/07, Sebastian Andrzej Siewior wrote: > > 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.
Reviewed-by: Oleg Nesterov <oleg@redhat.com>
> Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> > --- > kernel/events/uprobes.c | 16 +++++++--------- > 1 file changed, 7 insertions(+), 9 deletions(-) > > diff --git a/kernel/events/uprobes.c b/kernel/events/uprobes.c > index 41a2555..c8e5204 100644 > --- a/kernel/events/uprobes.c > +++ b/kernel/events/uprobes.c > @@ -1528,17 +1528,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); > } > > /* > -- > 1.7.10.4 >
| |