mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Quanfa Fu <quanfafu@gmail.com>
To: rostedt@goodmis.org, mhiramat@kernel.org
Cc: linux-kernel@vger.kernel.org, linux-trace-kernel@vger.kernel.org,
	Quanfa Fu <quanfafu@gmail.com>
Subject: [PATCH v2] tracing/eprobe: Replace snprintf with memcpy
Date: Mon,  9 Jan 2023 11:32:13 +0800	[thread overview]
Message-ID: <20230109033213.3220884-1-quanfafu@gmail.com> (raw)

No need to check for negative return value from snprintf() as the
code does not return negative values. Replace snprintf with memcpy.

Signed-off-by: Quanfa Fu <quanfafu@gmail.com>

-----
V1 -> V2: memory allc uses kzalloc and replace snprintf with memcpy
---
 kernel/trace/trace_eprobe.c | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/kernel/trace/trace_eprobe.c b/kernel/trace/trace_eprobe.c
index 352b65e2b910..56eb39f495f6 100644
--- a/kernel/trace/trace_eprobe.c
+++ b/kernel/trace/trace_eprobe.c
@@ -905,7 +905,7 @@ static int trace_eprobe_tp_update_arg(struct trace_eprobe *ep, const char *argv[
 static int trace_eprobe_parse_filter(struct trace_eprobe *ep, int argc, const char *argv[])
 {
 	struct event_filter *dummy = NULL;
-	int i, ret, len = 0;
+	int i, ret, arg_len, len = 0;
 	char *p;
 
 	if (argc == 0) {
@@ -923,17 +923,17 @@ static int trace_eprobe_parse_filter(struct trace_eprobe *ep, int argc, const ch
 
 	p = ep->filter_str;
 	for (i = 0; i < argc; i++) {
-		ret = snprintf(p, len, "%s ", argv[i]);
-		if (ret < 0)
-			goto error;
-		if (ret > len) {
-			ret = -E2BIG;
-			goto error;
-		}
-		p += ret;
-		len -= ret;
+		arg_len = strlen(argv[i]);
+		memcpy((void *)p, argv[i], arg_len);
+
+		if (i == argc - 1)
+			p[arg_len] = '\0';
+		else
+			p[arg_len] = ' ';
+
+		p += arg_len + 1;
+		len -= arg_len + 1;
 	}
-	p[-1] = '\0';
 
 	/*
 	 * Ensure the filter string can be parsed correctly. Note, this
-- 
2.31.1


             reply	other threads:[~2023-01-09  3:34 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-01-09  3:32 Quanfa Fu [this message]
2023-01-09  3:52 ` Steven Rostedt
2023-01-09  4:07   ` Quanfa Fu

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=20230109033213.3220884-1-quanfafu@gmail.com \
    --to=quanfafu@gmail.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-trace-kernel@vger.kernel.org \
    --cc=mhiramat@kernel.org \
    --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®