From: "Geyslan G. Bem" <geyslan@gmail.com>
To: unlisted-recipients:; (no To-header on input)
Cc: kernel-br@googlegroups.com, "Geyslan G. Bem" <geyslan@gmail.com>,
Steven Rostedt <rostedt@goodmis.org>,
Frederic Weisbecker <fweisbec@gmail.com>,
Ingo Molnar <mingo@redhat.com>,
linux-kernel@vger.kernel.org (open list)
Subject: [PATCH] tracing: fix referencing after memory freeing and refactors code
Date: Thu, 17 Oct 2013 22:44:56 -0300 [thread overview]
Message-ID: <1382060696-30746-1-git-send-email-geyslan@gmail.com> (raw)
Restructures function logic conditions testing 'tracing_open_generic'
return before the others. It avoids: unnecessary trace_array_get and
kzalloc when tracing is disabled; and fix the possible 'dir'
assignment after freeing it.
Centralizes the exiting, ensuring the 'trace_array_put' on error,
in accordance to Coding Style, Chapter 7.
Signed-off-by: Geyslan G. Bem <geyslan@gmail.com>
---
kernel/trace/trace_events.c | 22 ++++++++++++----------
1 file changed, 12 insertions(+), 10 deletions(-)
diff --git a/kernel/trace/trace_events.c b/kernel/trace/trace_events.c
index 368a4d5..8232362 100644
--- a/kernel/trace/trace_events.c
+++ b/kernel/trace/trace_events.c
@@ -1108,26 +1108,28 @@ static int system_tr_open(struct inode *inode, struct file *filp)
struct trace_array *tr = inode->i_private;
int ret;
- if (trace_array_get(tr) < 0)
- return -ENODEV;
+ ret = tracing_open_generic(inode, filp);
+ if (ret)
+ return ret;
+
+ ret = trace_array_get(tr);
+ if (ret)
+ return ret;
/* Make a temporary dir that has no system but points to tr */
dir = kzalloc(sizeof(*dir), GFP_KERNEL);
if (!dir) {
- trace_array_put(tr);
- return -ENOMEM;
+ ret = -ENOMEM;
+ goto err_dir;
}
dir->tr = tr;
- ret = tracing_open_generic(inode, filp);
- if (ret < 0) {
- trace_array_put(tr);
- kfree(dir);
- }
-
filp->private_data = dir;
+ return 0;
+err_dir:
+ trace_array_put(tr);
return ret;
}
--
1.8.4
next reply other threads:[~2013-10-18 1:49 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-10-18 1:44 Geyslan G. Bem [this message]
2013-10-18 2:46 ` Steven Rostedt
2013-10-18 9:49 ` Geyslan Gregório Bem
2013-10-18 11:02 ` Geyslan Gregório Bem
2013-10-18 12:34 ` Steven Rostedt
2013-10-19 12:43 ` Oleg Nesterov
2013-10-19 13:34 ` Oleg Nesterov
2013-10-19 13:58 ` Geyslan Gregório Bem
2013-10-19 14:18 ` Oleg Nesterov
2013-10-19 14:41 ` Geyslan Gregório Bem
2013-10-19 19:10 ` Steven Rostedt
2013-10-19 19:35 ` Geyslan Gregório Bem
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1382060696-30746-1-git-send-email-geyslan@gmail.com \
--to=geyslan@gmail.com \
--cc=fweisbec@gmail.com \
--cc=kernel-br@googlegroups.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=rostedt@goodmis.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®