From 0f3885ff95e318cbea7f596dcd5b63313fcd5b94 Mon Sep 17 00:00:00 2001 From: Chen Gang Date: Mon, 8 Apr 2013 12:06:44 +0800 Subject: [PATCH] --- yaml --- r: 362519 b: refs/heads/master c: 67012ab1d2ce871afea4ee55408f233f97d09d07 h: refs/heads/master i: 362517: e5ead2d5c76a46c9a7cc27594692cd37ef56039a 362515: d823c33956144b07c48792ed6186962a8505f709 362511: a977255ad02dd1b7b862364ac1c0c1ff0dec0c52 v: v3 --- [refs] | 2 +- trunk/kernel/trace/trace.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index b595b6590ceb..e7af5200428b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c97847d2f0eb77c806e650e04d9bbcf79fa05730 +refs/heads/master: 67012ab1d2ce871afea4ee55408f233f97d09d07 diff --git a/trunk/kernel/trace/trace.c b/trunk/kernel/trace/trace.c index 4f1dade56981..3f5046a4d81b 100644 --- a/trunk/kernel/trace/trace.c +++ b/trunk/kernel/trace/trace.c @@ -132,7 +132,7 @@ static char *default_bootup_tracer; 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 = 1; @@ -162,7 +162,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; }