From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754490AbbBEUnk (ORCPT ); Thu, 5 Feb 2015 15:43:40 -0500 Received: from smtprelay0180.hostedemail.com ([216.40.44.180]:50042 "EHLO smtprelay.hostedemail.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1754463AbbBEUnj (ORCPT ); Thu, 5 Feb 2015 15:43:39 -0500 X-Session-Marker: 6E657665747340676F6F646D69732E6F7267 X-Spam-Summary: 2,0,0,,d41d8cd98f00b204,rostedt@goodmis.org,:::,RULES_HIT:41:355:379:541:599:960:973:988:989:1260:1277:1311:1313:1314:1345:1359:1437:1515:1516:1518:1534:1541:1593:1594:1711:1730:1747:1777:1792:2393:2553:2559:2562:2693:2898:3138:3139:3140:3141:3142:3352:3622:3865:3866:3867:3868:3871:3873:3874:5007:6119:6261:7576:7875:7903:10004:10400:10848:10967:11026:11232:11658:11914:12043:12114:12438:12517:12519:12555:12663:12740:13069:13255:13311:13357:13972:14096:14097:21080,0,RBL:none,CacheIP:none,Bayesian:0.5,0.5,0.5,Netcheck:none,DomainCache:0,MSF:not bulk,SPF:fn,MSBL:0,DNSBL:none,Custom_rules:0:0:0 X-HE-Tag: drain51_2871b28ebc54 X-Filterd-Recvd-Size: 2064 Date: Thu, 5 Feb 2015 15:43:36 -0500 From: Steven Rostedt To: Al Viro Cc: linux-kernel@vger.kernel.org Subject: Re: [RFC][PATCH 1/7] trace: fix the glob match in __unregister_ftrace_function_probe() Message-ID: <20150205154336.0be014e9@gandalf.local.home> In-Reply-To: <1423166200-1800-1-git-send-email-viro@ZenIV.linux.org.uk> References: <20150205194914.GR29656@ZenIV.linux.org.uk> <1423166200-1800-1-git-send-email-viro@ZenIV.linux.org.uk> X-Mailer: Claws Mail 3.11.1 (GTK+ 2.24.25; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, 5 Feb 2015 19:56:34 +0000 Al Viro wrote: > From: Al Viro > > For patterns starting with '*' we need to match against 'search', not > 'glob'. > > Signed-off-by: Al Viro > --- > kernel/trace/ftrace.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c > index 224e768..9f90a4f 100644 > --- a/kernel/trace/ftrace.c > +++ b/kernel/trace/ftrace.c Can you make search = NULL instead of glob at the start of the function. That is: if (!glob || strcmp(glob, "*") == 0 || !strlen(glob)) search = NULL; > @@ -3802,7 +3802,7 @@ __unregister_ftrace_function_probe(char *glob, struct ftrace_probe_ops *ops, > if (glob) { And then here have if (search) { > kallsyms_lookup(entry->ip, NULL, NULL, > NULL, str); > - if (!ftrace_match(str, glob, len, type)) > + if (!ftrace_match(str, search, len, type)) Otherwise I'm sure there's a gcc out there that will give a warning about search being used uninitialized. -- Steve > continue; > } >