lkml.org 
[lkml]   [2013]   [Jan]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH 1/5] uprobes: Ensure inode != NULL in create_trace_uprobe()
    probe_event_enable/disable() check tu->inode != NULL at the start.
    This is ugly, if igrab() can fail create_trace_uprobe() should not
    succeed and "postpone" the failure.

    Note: alloc_uprobe() should probably check igrab() != NULL as well.

    Signed-off-by: Oleg Nesterov <oleg@redhat.com>
    ---
    kernel/trace/trace_uprobe.c | 6 ++++--
    1 files changed, 4 insertions(+), 2 deletions(-)

    diff --git a/kernel/trace/trace_uprobe.c b/kernel/trace/trace_uprobe.c
    index 0c05288..f49ccf9 100644
    --- a/kernel/trace/trace_uprobe.c
    +++ b/kernel/trace/trace_uprobe.c
    @@ -349,6 +349,8 @@ static int create_trace_uprobe(int argc, char **argv)

    inode = igrab(path.dentry->d_inode);
    path_put(&path);
    + if (!inode)
    + goto fail_address_parse;

    ret = kstrtoul(arg, 0, &offset);
    if (ret)
    @@ -645,7 +647,7 @@ static int probe_event_enable(struct trace_uprobe *tu, int flag)
    struct uprobe_trace_consumer *utc;
    int ret = 0;

    - if (!tu->inode || tu->consumer)
    + if (tu->consumer)
    return -EINTR;

    utc = kzalloc(sizeof(struct uprobe_trace_consumer), GFP_KERNEL);
    @@ -670,7 +672,7 @@ static int probe_event_enable(struct trace_uprobe *tu, int flag)

    static void probe_event_disable(struct trace_uprobe *tu, int flag)
    {
    - if (!tu->inode || !tu->consumer)
    + if (!tu->consumer)
    return;

    uprobe_unregister(tu->inode, tu->offset, &tu->consumer->cons);
    --
    1.5.5.1


    \
     
     \ /
      Last update: 2013-01-28 19:41    [W:2.842 / U:0.252 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site