git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
tracing/filters: Fix MATCH_FULL filter matching for PTR_STRING
[safe/jmp/linux-2.6]
/
kernel
/
trace
/
trace_events_filter.c
diff --git
a/kernel/trace/trace_events_filter.c
b/kernel/trace/trace_events_filter.c
index
11c3973
..
60c2a4e
100644
(file)
--- a/
kernel/trace/trace_events_filter.c
+++ b/
kernel/trace/trace_events_filter.c
@@
-211,8
+211,9
@@
static int filter_pred_pchar(struct filter_pred *pred, void *event,
{
char **addr = (char **)(event + pred->offset);
int cmp, match;
{
char **addr = (char **)(event + pred->offset);
int cmp, match;
+ int len = strlen(*addr) + 1; /* including tailing '\0' */
- cmp = pred->regex.match(*addr, &pred->regex,
pred->regex.field_
len);
+ cmp = pred->regex.match(*addr, &pred->regex, len);
match = cmp ^ pred->not;
match = cmp ^ pred->not;
@@
-268,16
+269,17
@@
static int regex_match_front(char *str, struct regex *r, int len)
static int regex_match_middle(char *str, struct regex *r, int len)
{
static int regex_match_middle(char *str, struct regex *r, int len)
{
- if (str
str(str, r->patter
n))
+ if (str
nstr(str, r->pattern, le
n))
return 1;
return 0;
}
static int regex_match_end(char *str, struct regex *r, int len)
{
return 1;
return 0;
}
static int regex_match_end(char *str, struct regex *r, int len)
{
-
char *ptr = strstr(str, r->pattern)
;
+
int strlen = len - 1
;
- if (ptr && (ptr[r->len] == 0))
+ if (strlen >= r->len &&
+ memcmp(str + strlen - r->len, r->pattern, r->len) == 0)
return 1;
return 0;
}
return 1;
return 0;
}
@@
-781,10
+783,8
@@
static int filter_add_pred(struct filter_parse_state *ps,
pred->regex.field_len = field->size;
} else if (field->filter_type == FILTER_DYN_STRING)
fn = filter_pred_strloc;
pred->regex.field_len = field->size;
} else if (field->filter_type == FILTER_DYN_STRING)
fn = filter_pred_strloc;
- else
{
+ else
fn = filter_pred_pchar;
fn = filter_pred_pchar;
- pred->regex.field_len = strlen(pred->regex.pattern);
- }
} else {
if (field->is_signed)
ret = strict_strtoll(pred->regex.pattern, 0, &val);
} else {
if (field->is_signed)
ret = strict_strtoll(pred->regex.pattern, 0, &val);