Skip to content

Commit

Permalink
tracing: Do not assign filp->private_data to freed memory
Browse files Browse the repository at this point in the history
In system_tr_open(), the filp->private_data can be assigned the 'dir'
variable even if it was freed. This is on the error path, and is
harmless because the error return code will prevent filp->private_data
from being used. But for correctness, we should not assign it to
a recently freed variable, as that can cause static tools to give
false warnings.

Also have both subsystem_open() and system_tr_open() return -ENODEV
if tracing has been disabled.

Link: http://lkml.kernel.org/r/1383764571-7318-1-git-send-email-geyslan@gmail.com

Signed-off-by: Geyslan G. Bem <geyslan@gmail.com>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
  • Loading branch information
Geyslan G. Bem authored and Steven Rostedt committed Nov 6, 2013
1 parent 2e86421 commit d6d3523
Showing 1 changed file with 8 additions and 1 deletion.
9 changes: 8 additions & 1 deletion kernel/trace/trace_events.c
Original file line number Diff line number Diff line change
Expand Up @@ -1062,6 +1062,9 @@ static int subsystem_open(struct inode *inode, struct file *filp)
struct trace_array *tr;
int ret;

if (tracing_is_disabled())
return -ENODEV;

/* Make sure the system still exists */
mutex_lock(&trace_types_lock);
mutex_lock(&event_mutex);
Expand Down Expand Up @@ -1108,6 +1111,9 @@ static int system_tr_open(struct inode *inode, struct file *filp)
struct trace_array *tr = inode->i_private;
int ret;

if (tracing_is_disabled())
return -ENODEV;

if (trace_array_get(tr) < 0)
return -ENODEV;

Expand All @@ -1124,11 +1130,12 @@ static int system_tr_open(struct inode *inode, struct file *filp)
if (ret < 0) {
trace_array_put(tr);
kfree(dir);
return ret;
}

filp->private_data = dir;

return ret;
return 0;
}

static int subsystem_release(struct inode *inode, struct file *file)
Expand Down

0 comments on commit d6d3523

Please sign in to comment.