From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754557AbbBFEAV (ORCPT ); Thu, 5 Feb 2015 23:00:21 -0500 Received: from zeniv.linux.org.uk ([195.92.253.2]:51299 "EHLO ZenIV.linux.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753268AbbBFEAR (ORCPT ); Thu, 5 Feb 2015 23:00:17 -0500 From: Al Viro To: Steven Rostedt Cc: linux-kernel@vger.kernel.org Subject: [RFC][PATCH v2 3/7] trace_events_filter.c: switch to memcmp() and memmem() for matching Date: Fri, 6 Feb 2015 04:00:11 +0000 Message-Id: <1423195215-25134-3-git-send-email-viro@ZenIV.linux.org.uk> X-Mailer: git-send-email 1.7.7.6 In-Reply-To: <20150205224632.GW29656@ZenIV.linux.org.uk> References: <20150205224632.GW29656@ZenIV.linux.org.uk> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Al Viro we know the lengths in advance... Signed-off-by: Al Viro --- kernel/trace/trace_events_filter.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/kernel/trace/trace_events_filter.c b/kernel/trace/trace_events_filter.c index ced69da..6c4a96b 100644 --- a/kernel/trace/trace_events_filter.c +++ b/kernel/trace/trace_events_filter.c @@ -271,21 +271,25 @@ static int filter_pred_none(struct filter_pred *pred, void *event) static int regex_match_full(char *str, struct regex *r, int len) { - if (strncmp(str, r->pattern, len) == 0) + if (len - 1 != r->len) + return 0; + if (memcmp(str, r->pattern, r->len) == 0) return 1; return 0; } static int regex_match_front(char *str, struct regex *r, int len) { - if (strncmp(str, r->pattern, r->len) == 0) + if (len - 1 < r->len) + return 0; + if (memcmp(str, r->pattern, r->len) == 0) return 1; return 0; } static int regex_match_middle(char *str, struct regex *r, int len) { - if (strnstr(str, r->pattern, len)) + if (memmem(str, len, r->pattern, r->len)) return 1; return 0; } -- 2.1.4