diff options
| author | Kees Cook <keescook@chromium.org> | 2014-03-15 13:11:18 -0700 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2014-03-28 15:49:04 -0700 |
| commit | 4c332c3238ab41fa9bc18d6ccb8e8aec1c87a426 (patch) | |
| tree | 28acb5d259ed661881b7488842df111cf454f374 /arch | |
| parent | d21114236d0e1232023cb8c84bd29e06810f6a2f (diff) | |
| download | linux-stable-4c332c3238ab41fa9bc18d6ccb8e8aec1c87a426.tar.gz linux-stable-4c332c3238ab41fa9bc18d6ccb8e8aec1c87a426.tar.bz2 linux-stable-4c332c3238ab41fa9bc18d6ccb8e8aec1c87a426.zip | |
[IA64] Keep format strings from leaking into printk
The buffer being sent to printk has already had format strings
resolved. The string should not be reinterpreted again to avoid any
unintended format strings from leaking into printk.
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Tony Luck <tony.luck@intel.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/ia64/kernel/mca.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/ia64/kernel/mca.c b/arch/ia64/kernel/mca.c index b8edfa75a83f..601502ab7141 100644 --- a/arch/ia64/kernel/mca.c +++ b/arch/ia64/kernel/mca.c @@ -217,7 +217,7 @@ void ia64_mca_printk(const char *fmt, ...) /* Copy the output into mlogbuf */ if (oops_in_progress) { /* mlogbuf was abandoned, use printk directly instead. */ - printk(temp_buf); + printk("%s", temp_buf); } else { spin_lock(&mlogbuf_wlock); for (p = temp_buf; *p; p++) { @@ -268,7 +268,7 @@ void ia64_mlogbuf_dump(void) } *p = '\0'; if (temp_buf[0]) - printk(temp_buf); + printk("%s", temp_buf); mlogbuf_start = index; mlogbuf_timestamp = 0; |