mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Steven Rostedt <rostedt@goodmis.org>
To: linux-kernel@vger.kernel.org
Cc: Ingo Molnar <mingo@kernel.org>,
	Andrew Morton <akpm@linux-foundation.org>,
	Namhyung Kim <namhyung@kernel.org>,
	Geliang Tang <geliangtang@163.com>
Subject: [for-next][PATCH 3/8] ftrace: Use kasprintf() in ftrace_profile_tracefs()
Date: Sat, 19 Mar 2016 10:15:19 -0400	[thread overview]
Message-ID: <20160319141536.473708210@goodmis.org> (raw)
In-Reply-To: <20160319141516.683762867@goodmis.org>

[-- Attachment #1: 0003-ftrace-Use-kasprintf-in-ftrace_profile_tracefs.patch --]
[-- Type: text/plain, Size: 1262 bytes --]

From: Geliang Tang <geliangtang@163.com>

Use kasprintf() instead of kmalloc() and snprintf().

Link: http://lkml.kernel.org/r/135a7bc36e51fd9eaa57124dd2140285b771f738.1458050835.git.geliangtang@163.com

Acked-by: Namhyung Kim <namhyung@kernel.org>
Signed-off-by: Geliang Tang <geliangtang@163.com>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
---
 kernel/trace/ftrace.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c
index d3850cbb840f..6a93faafbea4 100644
--- a/kernel/trace/ftrace.c
+++ b/kernel/trace/ftrace.c
@@ -1030,8 +1030,7 @@ static __init void ftrace_profile_tracefs(struct dentry *d_tracer)
 	for_each_possible_cpu(cpu) {
 		stat = &per_cpu(ftrace_profile_stats, cpu);
 
-		/* allocate enough for function name + cpu number */
-		name = kmalloc(32, GFP_KERNEL);
+		name = kasprintf(GFP_KERNEL, "function%d", cpu);
 		if (!name) {
 			/*
 			 * The files created are permanent, if something happens
@@ -1043,7 +1042,6 @@ static __init void ftrace_profile_tracefs(struct dentry *d_tracer)
 			return;
 		}
 		stat->stat = function_stats;
-		snprintf(name, 32, "function%d", cpu);
 		stat->stat.name = name;
 		ret = register_stat_tracer(&stat->stat);
 		if (ret) {
-- 
2.7.0

  parent reply	other threads:[~2016-03-19 14:16 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-03-19 14:15 [for-next][PATCH 0/8] tracing: Last minute updates for 4.6 Steven Rostedt
2016-03-19 14:15 ` [for-next][PATCH 1/8] ftrace: Make ftrace_hash_rec_enable return update bool Steven Rostedt
2016-03-19 14:15 ` [for-next][PATCH 2/8] ftrace: Update dynamic ftrace calls only if necessary Steven Rostedt
2016-03-19 14:15 ` Steven Rostedt [this message]
2016-03-19 14:15 ` [for-next][PATCH 4/8] tracing: Fix return while holding a lock in register_tracer() Steven Rostedt
2016-03-19 14:15 ` [for-next][PATCH 5/8] tracing: Have preempt(irqs)off trace preempt disabled functions Steven Rostedt
2016-03-19 14:15 ` [for-next][PATCH 6/8] tracing: Fix crash from reading trace_pipe with sendfile Steven Rostedt
2016-03-19 14:15 ` [for-next][PATCH 7/8] x86: ftrace: Fix the misleading comment for arch/x86/kernel/ftrace.c Steven Rostedt
2016-03-19 14:15 ` [for-next][PATCH 8/8] tracing: Remove redundant reset per-CPU buff in irqsoff tracer Steven Rostedt

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=20160319141536.473708210@goodmis.org \
    --to=rostedt@goodmis.org \
    --cc=akpm@linux-foundation.org \
    --cc=geliangtang@163.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mingo@kernel.org \
    --cc=namhyung@kernel.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®