diff options
author | Matt Fleming <matt.fleming@intel.com> | 2014-04-03 14:46:20 -0700 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-05-06 07:55:32 -0700 |
commit | 9e9c7bb4839e7de12a08d6e6145e73dad351c1ba (patch) | |
tree | 30013a842635e7028b0304292de0974f86e263a3 /arch/sh | |
parent | 981752df71cfdab8096cb44a76a9b597cdde8796 (diff) | |
download | linux-3.10-9e9c7bb4839e7de12a08d6e6145e73dad351c1ba.tar.gz linux-3.10-9e9c7bb4839e7de12a08d6e6145e73dad351c1ba.tar.bz2 linux-3.10-9e9c7bb4839e7de12a08d6e6145e73dad351c1ba.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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/sh')
-rw-r--r-- | arch/sh/kernel/dumpstack.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sh/kernel/dumpstack.c b/arch/sh/kernel/dumpstack.c index b959f559260..8dfe645bcc4 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); } |