[IA64] Keep format strings from leaking into printk
authorKees Cook <keescook@chromium.org>
Sat, 15 Mar 2014 20:11:18 +0000 (13:11 -0700)
committerTony Luck <tony.luck@intel.com>
Fri, 28 Mar 2014 22:49:04 +0000 (15:49 -0700)
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>
arch/ia64/kernel/mca.c

index b8edfa75a83f9cd8bce4469d1d1c97b93b02d371..601502ab71414ddf578d4bb1af24659aed04cf3f 100644 (file)
@@ -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;