瀏覽代碼

[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>
Kees Cook 11 年之前
父節點
當前提交
4c332c3238
共有 1 個文件被更改,包括 2 次插入2 次删除
  1. 2 2
      arch/ia64/kernel/mca.c

+ 2 - 2
arch/ia64/kernel/mca.c

@@ -217,7 +217,7 @@ void ia64_mca_printk(const char *fmt, ...)
 	/* Copy the output into mlogbuf */
 	/* Copy the output into mlogbuf */
 	if (oops_in_progress) {
 	if (oops_in_progress) {
 		/* mlogbuf was abandoned, use printk directly instead. */
 		/* mlogbuf was abandoned, use printk directly instead. */
-		printk(temp_buf);
+		printk("%s", temp_buf);
 	} else {
 	} else {
 		spin_lock(&mlogbuf_wlock);
 		spin_lock(&mlogbuf_wlock);
 		for (p = temp_buf; *p; p++) {
 		for (p = temp_buf; *p; p++) {
@@ -268,7 +268,7 @@ void ia64_mlogbuf_dump(void)
 		}
 		}
 		*p = '\0';
 		*p = '\0';
 		if (temp_buf[0])
 		if (temp_buf[0])
-			printk(temp_buf);
+			printk("%s", temp_buf);
 		mlogbuf_start = index;
 		mlogbuf_start = index;
 
 
 		mlogbuf_timestamp = 0;
 		mlogbuf_timestamp = 0;