lkml.org 
[lkml]   [2008]   [Apr]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH 1/5 -v2] ftrace: simple clean ups

    Andrew Morton mentioned some clean ups that should be done to ftrace.
    This patch does some of the simple clean ups.

    Signed-off-by: Steven Rostedt <srostedt@redhat.com>
    ---
    kernel/trace/trace.c | 23 ++++++++++-------------
    1 file changed, 10 insertions(+), 13 deletions(-)

    Index: linux-sched-devel.git/kernel/trace/trace.c
    ===================================================================
    --- linux-sched-devel.git.orig/kernel/trace/trace.c 2008-04-18 23:01:57.000000000 -0400
    +++ linux-sched-devel.git/kernel/trace/trace.c 2008-04-18 23:03:52.000000000 -0400
    @@ -36,8 +36,7 @@ unsigned long __read_mostly tracing_max_
    unsigned long __read_mostly tracing_thresh;

    /* dummy trace to disable tracing */
    -static struct tracer no_tracer __read_mostly =
    -{
    +static struct tracer no_tracer __read_mostly = {
    .name = "none",
    };

    @@ -1961,8 +1960,8 @@ tracing_iter_ctrl_write(struct file *fil
    int neg = 0;
    int i;

    - if (cnt > 63)
    - cnt = 63;
    + if (cnt >= sizeof(buf))
    + return -EINVAL;

    if (copy_from_user(&buf, ubuf, cnt))
    return -EFAULT;
    @@ -2054,8 +2053,8 @@ tracing_ctrl_write(struct file *filp, co
    long val;
    char buf[64];

    - if (cnt > 63)
    - cnt = 63;
    + if (cnt >= sizeof(buf))
    + return -EINVAL;

    if (copy_from_user(&buf, ubuf, cnt))
    return -EFAULT;
    @@ -2154,10 +2153,8 @@ tracing_max_lat_read(struct file *filp,
    char buf[64];
    int r;

    - r = snprintf(buf, 64, "%ld\n",
    + r = scnprintf(buf, sizeof(buf), "%ld\n",
    *ptr == (unsigned long)-1 ? -1 : nsecs_to_usecs(*ptr));
    - if (r > 64)
    - r = 64;
    return simple_read_from_buffer(ubuf, cnt, ppos, buf, r);
    }

    @@ -2169,8 +2166,8 @@ tracing_max_lat_write(struct file *filp,
    long val;
    char buf[64];

    - if (cnt > 63)
    - cnt = 63;
    + if (cnt >= sizeof(buf))
    + return -EINVAL;

    if (copy_from_user(&buf, ubuf, cnt))
    return -EFAULT;
    @@ -2434,8 +2431,8 @@ tracing_entries_write(struct file *filp,
    unsigned long val;
    char buf[64];

    - if (cnt > 63)
    - cnt = 63;
    + if (cnt >= sizeof(buf))
    + return -EINVAL;

    if (copy_from_user(&buf, ubuf, cnt))
    return -EFAULT;



    \
     
     \ /
      Last update: 2008-04-19 05:13    [W:3.064 / U:0.044 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site