tracing/eprobe: Replace snprintf with memcpy
PATCH v2 1/1 tracing/eprobe: Replace snprintf with memcpy
No need to check for negative return value from snprintf() as the code does not return negative values. Replace snprintf with memcpy.
-----
V1 -> V2: memory allc uses kzalloc and replace snprintf with memcpy
--- kernel/trace/trace_eprobe.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-)
kernel/trace/trace_eprobe.c +11 -11
@@ -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
Signature · 1 line
2.31.1
Steven Rostedt
maintainerQuoted 14 lines · On Mon, 9 Jan 2023 11:32:13 +0800 Quanfa Fu <[email protected]> wrote:
kernel/trace/trace_eprobe.c +1
-9@@ -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]);
kernel/trace/trace_eprobe.c static int trace_eprobe_parse_filter(struct trace_eprobe *ep, int argc, const ch · line 936
Quoted 10 lines
kernel/trace/trace_eprobe.c +9
-0+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 ; }
The above is too complex. I mentioned strncat() but you could still just keep snprintf() too, which adds the '\0';
for (i = 0; i < argc; i++) {
if (i)
ret = snprintf(p, len, " %s", argv[i]);
else
ret = snprintf(p, len, "%s", argv[i]);
p += ret;
len -= ret;
}-- Steve
Quoted 4 lines
kernel/trace/trace_eprobe.c +0
-1- p[-1 ] ='\0' ;/* * Ensure the filter string can be parsed correctly. Note, this
Thanks, I'll check it out.
Thanks !!
Quoted 47 lines · Steven Rostedt
Quoted 14 lines · On Mon, 9 Jan 2023 11:32:13 +0800 Quanfa Fu <[email protected]> wrote:
kernel/trace/trace_eprobe.c +1
-9@@ -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]);kernel/trace/trace_eprobe.c static int trace_eprobe_parse_filter(struct trace_eprobe *ep, int argc, const ch · line 936
Quoted 10 lines
kernel/trace/trace_eprobe.c +9
-0+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 ; }The above is too complex. I mentioned
strncat()but you could still just keepsnprintf()too, which adds the '\0';for (i = 0; i < argc; i++) { if (i) ret = snprintf(p, len, " %s", argv[i]); else ret = snprintf(p, len, "%s", argv[i]); p += ret; len -= ret; }-- Steve
Quoted 4 lines
kernel/trace/trace_eprobe.c +0
-1- p[-1 ] ='\0' ;/* * Ensure the filter string can be parsed correctly. Note, this