From mboxrd@z Thu Jan 1 00:00:00 1970 From: Chen Gang Subject: [PATCH] arch: blackfin: kernel: sprintf(), need avoid NUL for '%s' Date: Wed, 29 May 2013 17:43:16 +0800 Message-ID: <51A5CDB4.9000204@asianux.com> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Return-path: Sender: linux-kernel-owner@vger.kernel.org To: Mike Frysinger , anton.vorontsov@linaro.org, Richard Kuo , jesper.nilsson@axis.com Cc: Andrew Morton , David Miller , "uclinux-dist-devel@blackfin.uclinux.org" , "linux-kernel@vger.kernel.org" , Linux-Arch List-Id: linux-arch.vger.kernel.org When it is kernel symbol, the 'modname' will be NUL, and the 'symname' contents the valid name. So for sprintf(), need avoid NUL for '%s'. Signed-off-by: Chen Gang --- arch/blackfin/kernel/trace.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/arch/blackfin/kernel/trace.c b/arch/blackfin/kernel/trace.c index c36efa0..11f98bb 100644 --- a/arch/blackfin/kernel/trace.c +++ b/arch/blackfin/kernel/trace.c @@ -51,7 +51,7 @@ void decode_address(char *buf, unsigned long address) if (!modname) modname = delim = ""; sprintf(buf, "{ %s%s%s%s + 0x%lx }", - delim, modname, delim, symname, + delim, modname ? : "kernel", delim, symname, (unsigned long)offset); return; } -- 1.7.7.6 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from intranet.asianux.com ([58.214.24.6]:35443 "EHLO intranet.asianux.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965205Ab3E2JoI (ORCPT ); Wed, 29 May 2013 05:44:08 -0400 Message-ID: <51A5CDB4.9000204@asianux.com> Date: Wed, 29 May 2013 17:43:16 +0800 From: Chen Gang MIME-Version: 1.0 Subject: [PATCH] arch: blackfin: kernel: sprintf(), need avoid NUL for '%s' Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Sender: linux-arch-owner@vger.kernel.org List-ID: To: Mike Frysinger , anton.vorontsov@linaro.org, Richard Kuo , jesper.nilsson@axis.com Cc: Andrew Morton , David Miller , "uclinux-dist-devel@blackfin.uclinux.org" , "linux-kernel@vger.kernel.org" , Linux-Arch Message-ID: <20130529094316.p4TrCNAbTOefBqq6fy8RFlRCIi446zrailJUmDsGsz0@z> When it is kernel symbol, the 'modname' will be NUL, and the 'symname' contents the valid name. So for sprintf(), need avoid NUL for '%s'. Signed-off-by: Chen Gang --- arch/blackfin/kernel/trace.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/arch/blackfin/kernel/trace.c b/arch/blackfin/kernel/trace.c index c36efa0..11f98bb 100644 --- a/arch/blackfin/kernel/trace.c +++ b/arch/blackfin/kernel/trace.c @@ -51,7 +51,7 @@ void decode_address(char *buf, unsigned long address) if (!modname) modname = delim = ""; sprintf(buf, "{ %s%s%s%s + 0x%lx }", - delim, modname, delim, symname, + delim, modname ? : "kernel", delim, symname, (unsigned long)offset); return; } -- 1.7.7.6