From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756578AbZERLjB (ORCPT ); Mon, 18 May 2009 07:39:01 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1756478AbZERLii (ORCPT ); Mon, 18 May 2009 07:38:38 -0400 Received: from cn.fujitsu.com ([222.73.24.84]:49885 "EHLO song.cn.fujitsu.com" rhost-flags-OK-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1756464AbZERLig (ORCPT ); Mon, 18 May 2009 07:38:36 -0400 Message-ID: <4A11480F.3030000@cn.fujitsu.com> Date: Mon, 18 May 2009 19:35:43 +0800 From: Lai Jiangshan User-Agent: Thunderbird 2.0.0.6 (Windows/20070728) MIME-Version: 1.0 To: Ingo Molnar CC: Steven Rostedt , Li Zefan , LKML Subject: [PATCH] tracing: use strlcpy instead of strncpy Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org strlcpy() will add '\0' for the copied string. [Impact] cleanup Signed-off-by: Lai Jiangshan --- diff --git a/kernel/trace/blktrace.c b/kernel/trace/blktrace.c index 05b4747..9359e85 100644 --- a/kernel/trace/blktrace.c +++ b/kernel/trace/blktrace.c @@ -434,8 +434,7 @@ int do_blk_trace_setup(struct request_queue *q, char *name, dev_t dev, if (!buts->buf_size || !buts->buf_nr) return -EINVAL; - strncpy(buts->name, name, BLKTRACE_BDEV_SIZE); - buts->name[BLKTRACE_BDEV_SIZE - 1] = '\0'; + strlcpy(buts->name, name, BLKTRACE_BDEV_SIZE); /* * some device names have larger paths - convert the slashes diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c index 665a915..2484555 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c @@ -133,7 +133,7 @@ static char *default_bootup_tracer; static int __init set_ftrace(char *str) { - strncpy(bootup_tracer_buf, str, BOOTUP_TRACER_SIZE); + strlcpy(bootup_tracer_buf, str, BOOTUP_TRACER_SIZE); default_bootup_tracer = bootup_tracer_buf; /* We are using ftrace early, expand it */ ring_buffer_expanded = 1; diff --git a/kernel/trace/trace_branch.c b/kernel/trace/trace_branch.c index 7a7a9fd..a84e036 100644 --- a/kernel/trace/trace_branch.c +++ b/kernel/trace/trace_branch.c @@ -67,10 +67,8 @@ probe_likely_condition(struct ftrace_branch_data *f, int val, int expect) p--; p++; - strncpy(entry->func, f->func, TRACE_FUNC_SIZE); - strncpy(entry->file, p, TRACE_FILE_SIZE); - entry->func[TRACE_FUNC_SIZE] = 0; - entry->file[TRACE_FILE_SIZE] = 0; + strlcpy(entry->func, f->func, TRACE_FUNC_SIZE); + strlcpy(entry->file, p, TRACE_FILE_SIZE); entry->line = f->line; entry->correct = val == expect;