summaryrefslogtreecommitdiff
path: root/arch/sh
diff options
context:
space:
mode:
authorMatt Fleming <matt.fleming@intel.com>2014-04-03 14:46:20 -0700
committerJiri Slaby <jslaby@suse.cz>2014-05-15 09:55:35 +0200
commit3937fa5f06d7a2b60545bf52b7b7379a970a6a8a (patch)
treedaafee020e3e348954e65f4ca0c8c0fe2092bd83 /arch/sh
parent1fd646cfcd588ca085885963681add522ee90131 (diff)
downloadlwn-3937fa5f06d7a2b60545bf52b7b7379a970a6a8a.tar.gz
lwn-3937fa5f06d7a2b60545bf52b7b7379a970a6a8a.zip
sh: fix format string bug in stack tracer
commit a0c32761e73c9999cbf592b702f284221fea8040 upstream. Kees reported the following error: arch/sh/kernel/dumpstack.c: In function 'print_trace_address': arch/sh/kernel/dumpstack.c:118:2: error: format not a string literal and no format arguments [-Werror=format-security] Use the "%s" format so that it's impossible to interpret 'data' as a format string. Signed-off-by: Matt Fleming <matt.fleming@intel.com> Reported-by: Kees Cook <keescook@chromium.org> Acked-by: Kees Cook <keescook@chromium.org> Cc: Paul Mundt <lethal@linux-sh.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Diffstat (limited to 'arch/sh')
-rw-r--r--arch/sh/kernel/dumpstack.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sh/kernel/dumpstack.c b/arch/sh/kernel/dumpstack.c
index b959f5592604..8dfe645bcc4b 100644
--- a/arch/sh/kernel/dumpstack.c
+++ b/arch/sh/kernel/dumpstack.c
@@ -115,7 +115,7 @@ static int print_trace_stack(void *data, char *name)
*/
static void print_trace_address(void *data, unsigned long addr, int reliable)
{
- printk(data);
+ printk("%s", (char *)data);
printk_address(addr, reliable);
}