Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9607a869 authored by Chen Gang's avatar Chen Gang Committed by Steven Rostedt
Browse files

kernel: tracing: Use strlcpy instead of strncpy 

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: default avatarChen Gang <gang.chen@asianux.com>
Signed-off-by: default avatarSteven Rostedt <rostedt@goodmis.org>
parent 22f45649

kernel/trace/ftrace.c

+2 −2
Original line number Diff line number Diff line
@@ -3496,14 +3496,14 @@ static char ftrace_filter_buf[FTRACE_FILTER_SIZE] __initdata; 


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;

}

__setup("ftrace_notrace=", set_ftrace_notrace);



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;

}

__setup("ftrace_filter=", set_ftrace_filter);

kernel/trace/trace.c

+2 −2
Original line number Diff line number Diff line
@@ -125,7 +125,7 @@ static bool allocate_snapshot; 


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;

	/* We are using ftrace early, expand it */

	ring_buffer_expanded = true;
@@ -164,7 +164,7 @@ static char *trace_boot_options __initdata; 


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;

	return 0;

}