lkml.org 
[lkml]   [2009]   [Nov]   [21]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[tip:perf/core] ksym_tracer: Fix validation of length of access type
    Commit-ID:  92cf9f8f7e89c6bdbb1a724f879b8b18fc0dfe0f
    Gitweb: http://git.kernel.org/tip/92cf9f8f7e89c6bdbb1a724f879b8b18fc0dfe0f
    Author: Li Zefan <lizf@cn.fujitsu.com>
    AuthorDate: Tue, 7 Jul 2009 13:53:47 +0800
    Committer: Ingo Molnar <mingo@elte.hu>
    CommitDate: Fri, 10 Jul 2009 11:59:42 +0200

    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>
    ---
    kernel/trace/trace_ksym.c | 14 +++++++-------
    1 files changed, 7 insertions(+), 7 deletions(-)

    diff --git a/kernel/trace/trace_ksym.c b/kernel/trace/trace_ksym.c
    index 9556009..72fcb46 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;
    }


    \
     
     \ /
      Last update: 2009-11-21 14:39    [W:0.024 / U:33.056 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site