Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758208Ab2HHNCV (ORCPT ); Wed, 8 Aug 2012 09:02:21 -0400 Received: from mx1.redhat.com ([209.132.183.28]:47087 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758065Ab2HHNCT (ORCPT ); Wed, 8 Aug 2012 09:02:19 -0400 Date: Wed, 8 Aug 2012 14:58:45 +0200 From: Oleg Nesterov To: Sebastian Andrzej Siewior Cc: linux-kernel@vger.kernel.org, x86@kernel.org, Peter Zijlstra , Arnaldo Carvalho de Melo , Roland McGrath , Srikar Dronamraju , Ananth N Mavinakaynahalli , stan_shebs@mentor.com Subject: Re: [PATCH 3/5] uprobes: remove check for uprobe variable in handle_swbp() Message-ID: <20120808125845.GB4504@redhat.com> References: <1344355952-2382-1-git-send-email-bigeasy@linutronix.de> <1344355952-2382-4-git-send-email-bigeasy@linutronix.de> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1344355952-2382-4-git-send-email-bigeasy@linutronix.de> User-Agent: Mutt/1.5.18 (2008-05-17) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1435 Lines: 50 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 > Signed-off-by: Sebastian Andrzej Siewior > --- > 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 > -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/