evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

kernel: tracing: Use strlcpy instead of strncpy

Browse source 
Use strlcpy() instead of strncpy() as it will always add a '\0'
to the end of the string even if the buffer is smaller than what
is being copied.

Link: http://lkml.kernel.org/r/51624254.30301@asianux.com

Signed-off-by: Chen Gang <gang.chen@asianux.com>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
This commit is contained in:
Chen Gang 2013-04-08 12:06:44 +08:00 • committed by Steven Rostedt
parent 22f45649ce
commit 9607a869ee
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
kernel/trace/ftrace.c
View file

@ -3496,14 +3496,14 @@ static char ftrace_filter_buf[FTRACE_FILTER_SIZE] __initdata;
static int __init set_ftrace_notrace(char *str) static int __init set_ftrace_notrace(char *str)
{ {
strncpy(ftrace_notrace_buf, str, FTRACE_FILTER_SIZE); strlcpy(ftrace_notrace_buf, str, FTRACE_FILTER_SIZE);
return 1; return 1;
} }
__setup("ftrace_notrace=", set_ftrace_notrace); __setup("ftrace_notrace=", set_ftrace_notrace);
static int __init set_ftrace_filter(char *str) static int __init set_ftrace_filter(char *str)
{ {
strncpy(ftrace_filter_buf, str, FTRACE_FILTER_SIZE); strlcpy(ftrace_filter_buf, str, FTRACE_FILTER_SIZE);
return 1; return 1;
} }
__setup("ftrace_filter=", set_ftrace_filter); __setup("ftrace_filter=", set_ftrace_filter);

4
kernel/trace/trace.c
View file

@ -125,7 +125,7 @@ static bool allocate_snapshot;
static int __init set_cmdline_ftrace(char *str) static int __init set_cmdline_ftrace(char *str)
{ {
strncpy(bootup_tracer_buf, str, MAX_TRACER_SIZE); strlcpy(bootup_tracer_buf, str, MAX_TRACER_SIZE);
default_bootup_tracer = bootup_tracer_buf; default_bootup_tracer = bootup_tracer_buf;
/* We are using ftrace early, expand it */ /* We are using ftrace early, expand it */
ring_buffer_expanded = true; ring_buffer_expanded = true;
@ -164,7 +164,7 @@ static char *trace_boot_options __initdata;
static int __init set_trace_boot_options(char *str) static int __init set_trace_boot_options(char *str)
{ {
strncpy(trace_boot_options_buf, str, MAX_TRACER_SIZE); strlcpy(trace_boot_options_buf, str, MAX_TRACER_SIZE);
trace_boot_options = trace_boot_options_buf; trace_boot_options = trace_boot_options_buf;
return 0; return 0;
} }