aboutsummaryrefslogtreecommitdiff
path: root/kernel/trace
diff options
context:
space:
mode:
authorLi Zefan <lizf@cn.fujitsu.com>2009-07-07 13:53:47 +0800
committerIngo Molnar <mingo@elte.hu>2009-07-10 11:59:42 +0200
commit92cf9f8f7e89c6bdbb1a724f879b8b18fc0dfe0f (patch)
treecb7f7598bc6c9fade407b24fcbf1a83a92a997b7 /kernel/trace
parentf088e5471297cc78d7465e1fd997cb1a91a48019 (diff)
downloadlinux-2.6.38-lt-ux500-92cf9f8f7e89c6bdbb1a724f879b8b18fc0dfe0f.tar.gz
ksym_tracer: Fix validation of length of access type
Don't take newline into account, otherwise: # echo 'pid_max:-w-' > ksym_trace_filter # echo -n 'pid_max:rw-' > ksym_trace_filter bash: echo: write error: Invalid argument Signed-off-by: Li Zefan <lizf@cn.fujitsu.com> Acked-by: Frederic Weisbecker <fweisbec@gmail.com> Cc: "K.Prasad" <prasad@linux.vnet.ibm.com> Cc: Alan Stern <stern@rowland.harvard.edu> Cc: Steven Rostedt <rostedt@goodmis.org> LKML-Reference: <4A52E2EB.9070503@cn.fujitsu.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'kernel/trace')
-rw-r--r--kernel/trace/trace_ksym.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/kernel/trace/trace_ksym.c b/kernel/trace/trace_ksym.c
index 95560092990..72fcb46c39c 100644
--- a/kernel/trace/trace_ksym.c
+++ b/kernel/trace/trace_ksym.c
@@ -158,21 +158,21 @@ static int ksym_trace_get_access_type(char *str)
static int parse_ksym_trace_str(char *input_string, char **ksymname,
unsigned long *addr)
{
- char *delimiter = ":";
int ret;
- ret = -EINVAL;
- *ksymname = strsep(&input_string, delimiter);
+ strstrip(input_string);
+
+ *ksymname = strsep(&input_string, ":");
*addr = kallsyms_lookup_name(*ksymname);
/* Check for malformed request: (2), (1) and (5) */
if ((!input_string) ||
- (strlen(input_string) != (KSYM_TRACER_OP_LEN + 1)) ||
- (*addr == 0))
- goto return_code;
+ (strlen(input_string) != KSYM_TRACER_OP_LEN) ||
+ (*addr == 0))
+ return -EINVAL;;
+
ret = ksym_trace_get_access_type(input_string);
-return_code:
return ret;
}