[RFC][PATCH v2 3/7] trace_events_filter.c: switch to memcmp() and memmem() for matching

From: Al Viro
Date: Thu Feb 05 2015 - 23:00:28 EST


From: Al Viro <viro@xxxxxxxxxxxxxxxxxx>

we know the lengths in advance...

Signed-off-by: Al Viro <viro@xxxxxxxxxxxxxxxxxx>
---
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

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/