Skip to content

Commit eda1e32

Browse files
Jiri Olsarostedt
authored andcommitted
tracing: handle broken names in ftrace filter
If one filter item (for set_ftrace_filter and set_ftrace_notrace) is being setup by more than 1 consecutive writes (FTRACE_ITER_CONT flag), it won't be handled corretly. I used following program to test/verify: [snip] #include <stdio.h> #include <sys/types.h> #include <sys/stat.h> #include <fcntl.h> #include <string.h> int main(int argc, char **argv) { int fd, i; char *file = argv[1]; if (-1 == (fd = open(file, O_WRONLY))) { perror("open failed"); return -1; } for(i = 0; i < (argc - 2); i++) { int len = strlen(argv[2+i]); int cnt, off = 0; while(len) { cnt = write(fd, argv[2+i] + off, len); len -= cnt; off += cnt; } } close(fd); return 0; } [snip] before change: sh-4.0# echo > ./set_ftrace_filter sh-4.0# /test ./set_ftrace_filter "sys" "_open " sh-4.0# cat ./set_ftrace_filter #### all functions enabled #### sh-4.0# after change: sh-4.0# echo > ./set_ftrace_notrace sh-4.0# test ./set_ftrace_notrace "sys" "_open " sh-4.0# cat ./set_ftrace_notrace sys_open sh-4.0# Signed-off-by: Jiri Olsa <jolsa@redhat.com> LKML-Reference: <20090811152904.GA26065@jolsa.lab.eng.brq.redhat.com> Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
1 parent f2d84b6 commit eda1e32

File tree

1 file changed

+11
-6
lines changed

1 file changed

+11
-6
lines changed

kernel/trace/ftrace.c

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2278,7 +2278,11 @@ ftrace_regex_write(struct file *file, const char __user *ubuf,
22782278
read++;
22792279
cnt--;
22802280

2281-
if (!(iter->flags & ~FTRACE_ITER_CONT)) {
2281+
/*
2282+
* If the parser haven't finished with the last write,
2283+
* continue reading the user input without skipping spaces.
2284+
*/
2285+
if (!(iter->flags & FTRACE_ITER_CONT)) {
22822286
/* skip white space */
22832287
while (cnt && isspace(ch)) {
22842288
ret = get_user(ch, ubuf++);
@@ -2288,8 +2292,9 @@ ftrace_regex_write(struct file *file, const char __user *ubuf,
22882292
cnt--;
22892293
}
22902294

2295+
/* only spaces were written */
22912296
if (isspace(ch)) {
2292-
file->f_pos += read;
2297+
*ppos += read;
22932298
ret = read;
22942299
goto out;
22952300
}
@@ -2319,12 +2324,12 @@ ftrace_regex_write(struct file *file, const char __user *ubuf,
23192324
if (ret)
23202325
goto out;
23212326
iter->buffer_idx = 0;
2322-
} else
2327+
} else {
23232328
iter->flags |= FTRACE_ITER_CONT;
2329+
iter->buffer[iter->buffer_idx++] = ch;
2330+
}
23242331

2325-
2326-
file->f_pos += read;
2327-
2332+
*ppos += read;
23282333
ret = read;
23292334
out:
23302335
mutex_unlock(&ftrace_regex_lock);

0 commit comments

Comments
 (0)