tracing: fix referencing after memory freeing and refactors code
PATCH v2 1/1 tracing: fix referencing after memory freeing and refactors code
In 'system_tr_open()':
Fix possible 'dir' assignment after freeing it.
In both functions:
Restructures logic conditions testing 'tracing_is_disabled()' return before the others tests.
--- kernel/trace/trace_events.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
kernel/trace/trace_events.c +8 -1
@@ -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);
@@ -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 ;
@@ -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)
Signature · 1 line
1.8.4.2
Steven Rostedt
maintainerQuoted 2 lines · On Wed, 6 Nov 2013 16:02:51 -0300 "Geyslan G. Bem" <[email protected]> wrote:
In '
system_tr_open()':
Fix possible 'dir' assignment after freeing it.
I'll take this patch, but I'm going to reword the subject and the change log. The assignment of dir to filp->private_data after dir is freed is not as bad as it sounds. As we are returning an error, filp->private_data is never used.
-- Steve
Quoted 48 lines
In both functions:
Restructures logic conditions testing 'tracing_is_disabled()' return before the others tests.Signed-off-by Geyslan G. Bem <[email protected]>--- kernel/trace/trace_events.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)kernel/trace/trace_events.c +8
-1@@ -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);@@ -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 ;@@ -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)
2013/11/6 Steven Rostedt <[email protected]>:
Quoted 6 lines
Quoted 2 lines · On Wed, 6 Nov 2013 16:02:51 -0300 "Geyslan G. Bem" <[email protected]> wrote:
In '
system_tr_open()':
Fix possible 'dir' assignment after freeing it.
Quoted 8 lines
I'll take this patch, but I'm going to reword the subject and the change log. The assignment of dir to
filp->private_dataafter dir is freed is not as bad as it sounds. As we are returning an error,filp->private_datais never used.-- Steve
Ok Steve. Please, do the reword.
Quoted 49 lines
Quoted 48 lines
In both functions:
Restructures logic conditions testing 'tracing_is_disabled()' return before the others tests.Signed-off-by Geyslan G. Bem <[email protected]>--- kernel/trace/trace_events.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)kernel/trace/trace_events.c +8
-1@@ -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);@@ -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 ;@@ -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)
Signature · 4 lines
Regards, Geyslan G. Bem hackingbits.com