From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751707AbbBFSzY (ORCPT ); Fri, 6 Feb 2015 13:55:24 -0500 Received: from smtprelay0118.hostedemail.com ([216.40.44.118]:47674 "EHLO smtprelay.hostedemail.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751009AbbBFSzX (ORCPT ); Fri, 6 Feb 2015 13:55:23 -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:2895:3138:3139:3140:3141:3142:3353:3622:3865:3866:3867:3872:5007:6261:7875:10004:10400:10471:10848:10967:11026:11232:11658:11914:12043:12114:12296:12517:12519:12740:13069:13255:13311:13357: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: berry31_85fa4b2fd324b X-Filterd-Recvd-Size: 2737 Date: Fri, 6 Feb 2015 13:55:19 -0500 From: Steven Rostedt To: Al Viro Cc: linux-kernel@vger.kernel.org Subject: Re: [RFC][PATCH v2 5/7] trace: make filter_parse_regex() provide the length of substring to compare with Message-ID: <20150206135519.7ce422eb@gandalf.local.home> In-Reply-To: <1423195215-25134-5-git-send-email-viro@ZenIV.linux.org.uk> References: <20150205224632.GW29656@ZenIV.linux.org.uk> <1423195215-25134-5-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 Fri, 6 Feb 2015 04:00:13 +0000 Al Viro wrote: > --- a/kernel/trace/trace_events_filter.c > +++ b/kernel/trace/trace_events_filter.c > @@ -321,7 +321,7 @@ static int regex_match_end(char *str, struct regex *r, int len) > * not returns 1 if buff started with a '!' > * 0 otherwise. > */ Still needs the update to kernel doc. > -enum regex_type filter_parse_regex(char *buff, int len, char **search, int *not) > +enum regex_type filter_parse_regex(char *buff, int *len, char **search, int *not) > { > int type = MATCH_FULL; > int i; > @@ -329,13 +329,13 @@ enum regex_type filter_parse_regex(char *buff, int len, char **search, int *not) > if (buff[0] == '!') { > *not = 1; > buff++; > - len--; > + (*len)--; > } else > *not = 0; > > *search = buff; > > - for (i = 0; i < len; i++) { > + for (i = 0; i < *len; i++) { > if (buff[i] == '*') { > if (!i) { > *search = buff + 1; > @@ -350,6 +350,7 @@ enum regex_type filter_parse_regex(char *buff, int len, char **search, int *not) > } > } > } > + *len = strlen(*search); This should just add what the next patch does, instead of adding the strlen() then changing it again. The change works here as well. - *len = strlen(*search); + *len = buff + i - *search; It makes more sense to just add it here instead of having it changed again. -- Steve > > return type; > } > @@ -362,8 +363,7 @@ static void filter_build_regex(struct filter_pred *pred) > int not = 0; > > if (pred->op == OP_GLOB) { > - type = filter_parse_regex(r->pattern, r->len, &search, ¬); > - r->len = strlen(search); > + type = filter_parse_regex(r->pattern, &r->len, &search, ¬); > memmove(r->pattern, search, r->len+1); > } >