| From a0c32761e73c9999cbf592b702f284221fea8040 Mon Sep 17 00:00:00 2001 |
| From: Matt Fleming <matt.fleming@intel.com> |
| Date: Thu, 3 Apr 2014 14:46:20 -0700 |
| Subject: sh: fix format string bug in stack tracer |
| |
| From: Matt Fleming <matt.fleming@intel.com> |
| |
| 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> |
| |
| --- |
| arch/sh/kernel/dumpstack.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| --- a/arch/sh/kernel/dumpstack.c |
| +++ b/arch/sh/kernel/dumpstack.c |
| @@ -80,7 +80,7 @@ static int print_trace_stack(void *data, |
| */ |
| static void print_trace_address(void *data, unsigned long addr, int reliable) |
| { |
| - printk(data); |
| + printk("%s", (char *)data); |
| printk_address(addr, reliable); |
| } |
| |
