]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
tracing/filters: NIL-terminate user input filter
authorLi Zefan <lizf@cn.fujitsu.com>
Sat, 11 Apr 2009 07:52:18 +0000 (15:52 +0800)
committerIngo Molnar <mingo@elte.hu>
Sun, 12 Apr 2009 09:59:27 +0000 (11:59 +0200)
Make sure messages from user space are NIL-terminated strings,
otherwise we could dump random memory while reading filter file.

Try this:
 # echo 'parent_comm ==' > events/sched/sched_process_fork/filter
 # cat events/sched/sched_process_fork/filter
 parent_comm == �

Signed-off-by: Li Zefan <lizf@cn.fujitsu.com>
Acked-by: Tom Zanussi <tzanussi@gmail.com>
Acked-by: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
LKML-Reference: <49E04C32.6060508@cn.fujitsu.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
kernel/trace/trace_events.c

index 64ec4d278ffbcd56b94d0d161b855914756f3e0b..054bc1802bcd435f96921ef7746882ee9514d31a 100644 (file)
@@ -503,6 +503,7 @@ event_filter_write(struct file *filp, const char __user *ubuf, size_t cnt,
 
        if (copy_from_user(&buf, ubuf, cnt))
                return -EFAULT;
+       buf[cnt] = '\0';
 
        pred = kzalloc(sizeof(*pred), GFP_KERNEL);
        if (!pred)
@@ -569,6 +570,7 @@ subsystem_filter_write(struct file *filp, const char __user *ubuf, size_t cnt,
 
        if (copy_from_user(&buf, ubuf, cnt))
                return -EFAULT;
+       buf[cnt] = '\0';
 
        pred = kzalloc(sizeof(*pred), GFP_KERNEL);
        if (!pred)