From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754111Ab2GRLpe (ORCPT ); Wed, 18 Jul 2012 07:45:34 -0400 Received: from e3.ny.us.ibm.com ([32.97.182.143]:44511 "EHLO e3.ny.us.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751954Ab2GRLpb (ORCPT ); Wed, 18 Jul 2012 07:45:31 -0400 Date: Wed, 18 Jul 2012 17:15:22 +0530 From: Srikar Dronamraju To: Jovi Zhang Cc: Fr?d?ric Weisbecker , Steven Rostedt , LKML Subject: Re: uprobe: checking probe event include directory Message-ID: <20120718114522.GF5006@linux.vnet.ibm.com> Reply-To: Srikar Dronamraju References: <20120717105936.GC28744@somewhere> <20120717172736.GA6854@linux.vnet.ibm.com> <20120718110731.GE5006@linux.vnet.ibm.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.21 (2010-09-15) X-Content-Scanned: Fidelis XPS MAILER x-cbid: 12071811-8974-0000-0000-00000B4601ED Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org * Jovi Zhang [2012-07-18 19:38:27]: > On Wed, Jul 18, 2012 at 7:07 PM, Srikar Dronamraju > wrote: > > The patch looks good, > > > > Can you modify the description a bit. However you are free to ignore > > these comments. After knowing your response, I will ack the patch. > > > > I would probably put this as: > > > > The subject could be > > tracing: Verify target file before registering a uprobe event > > > > Description: > > Without this patch, we can register a uprobe event for a directory. > > Enabling such a uprobe event would anyway fail. > > > > Example: > > > > $ echo 'p /bin:0x4245c0' > /sys/kernel/debug/tracing/uprobe_events > > > > However directories cannot be valid targets for uprobe. > > Hence verify if the target is a regular file during the probe > > registration. > > Thanks srikar, your description is more clear than mine. > > > From fd5077196038cc271e2116e1fca359a0011e1669 Mon Sep 17 00:00:00 2001 > From: Jovi Zhang > Date: Wed, 18 Jul 2012 18:16:44 +0800 > Subject: [PATCH] tracing: Verify target file before registering a uprobe > event > > Without this patch, we can register a uprobe event for a directory. > Enabling such a uprobe event would anyway fail. > > Example: > $ echo 'p /bin:0x4245c0' > /sys/kernel/debug/tracing/uprobe_events > > However dirctories cannot be valid targets for uprobe. > Hence verify if the target is a regular file during the probe > registration. > > Signed-off-by: Jovi Zhang > Reviewed-by: Srikar Dronamraju > --- > kernel/trace/trace_uprobe.c | 6 +++++- > 1 file changed, 5 insertions(+), 1 deletion(-) > > diff --git a/kernel/trace/trace_uprobe.c b/kernel/trace/trace_uprobe.c > index 85158fa..3b5f646 100644 > --- a/kernel/trace/trace_uprobe.c > +++ b/kernel/trace/trace_uprobe.c > @@ -259,6 +259,10 @@ static int create_trace_uprobe(int argc, char **argv) > goto fail_address_parse; > > inode = igrab(path.dentry->d_inode); > + if (!S_ISREG(inode->i_mode) || S_ISDIR(inode->i_mode)) { > + ret = -EINVAL; > + goto fail_address_parse; > + } > > argc -= 2; > argv += 2; > @@ -358,7 +362,7 @@ fail_address_parse: > if (inode) > iput(inode); > > - pr_info("Failed to parse address.\n"); > + pr_info("Failed to parse address or file.\n"); > > return ret; > } Looks good. Acked-by: Srikar Dronamraju