4.14-stable patches

added patches:
	revert-x86-alternative-print-unadorned-pointers.patch

diff --git a/queue-4.14/revert-x86-alternative-print-unadorned-pointers.patch b/queue-4.14/revert-x86-alternative-print-unadorned-pointers.patch
new file mode 100644 (file)
index 0000000..8a1d037
--- /dev/null
+++ b/queue-4.14/revert-x86-alternative-print-unadorned-pointers.patch
@@ -0,0 +1,89 @@
+From ddf5d08f6fa96dd9f3911931079264d6099c6a51 Mon Sep 17 00:00:00 2001
+From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Date: Tue, 13 Feb 2018 10:14:14 +0100
+Subject: [PATCH] Revert "x86/alternative: Print unadorned pointers"
+
+This reverts commit 67eb59b8ecfb319438706cee2cb67a3045b54494.
+
+It's not needed in 4.14.y and only causes messy debugging messages, if
+anyone actually cares about these random debug messages in the first
+place (doubtful).
+
+Reported-by: Kees Cook <keescook@google.com>
+Acked-by: Borislav Petkov <bp@suse.de>
+Cc: Thomas Gleixner <tglx@linutronix.de>
+Cc: riel@redhat.com
+Cc: ak@linux.intel.com
+Cc: peterz@infradead.org
+Cc: David Woodhouse <dwmw2@infradead.org>
+Cc: jikos@kernel.org
+Cc: luto@amacapital.net
+Cc: dave.hansen@intel.com
+Cc: torvalds@linux-foundation.org
+Cc: keescook@google.com
+Cc: Josh Poimboeuf <jpoimboe@redhat.com>
+Cc: tim.c.chen@linux.intel.com
+Cc: gregkh@linux-foundation.org
+Cc: pjt@google.com
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ arch/x86/kernel/alternative.c |   14 +++++++-------
+ 1 file changed, 7 insertions(+), 7 deletions(-)
+
+--- a/arch/x86/kernel/alternative.c
++++ b/arch/x86/kernel/alternative.c
+@@ -287,7 +287,7 @@ recompute_jump(struct alt_instr *a, u8 *
+       tgt_rip  = next_rip + o_dspl;
+       n_dspl = tgt_rip - orig_insn;
+ 
+-      DPRINTK("target RIP: %px, new_displ: 0x%x", tgt_rip, n_dspl);
++      DPRINTK("target RIP: %p, new_displ: 0x%x", tgt_rip, n_dspl);
+ 
+       if (tgt_rip - orig_insn >= 0) {
+               if (n_dspl - 2 <= 127)
+@@ -344,7 +344,7 @@ static void __init_or_module noinline op
+       add_nops(instr + (a->instrlen - a->padlen), a->padlen);
+       local_irq_restore(flags);
+ 
+-      DUMP_BYTES(instr, a->instrlen, "%px: [%d:%d) optimized NOPs: ",
++      DUMP_BYTES(instr, a->instrlen, "%p: [%d:%d) optimized NOPs: ",
+                  instr, a->instrlen - a->padlen, a->padlen);
+ }
+ 
+@@ -365,7 +365,7 @@ void __init_or_module noinline apply_alt
+       u8 *instr, *replacement;
+       u8 insnbuf[MAX_PATCH_LEN];
+ 
+-      DPRINTK("alt table %px, -> %px", start, end);
++      DPRINTK("alt table %p -> %p", start, end);
+       /*
+        * The scan order should be from start to end. A later scanned
+        * alternative code can overwrite previously scanned alternative code.
+@@ -389,14 +389,14 @@ void __init_or_module noinline apply_alt
+                       continue;
+               }
+ 
+-              DPRINTK("feat: %d*32+%d, old: (%px len: %d), repl: (%px, len: %d), pad: %d",
++              DPRINTK("feat: %d*32+%d, old: (%p, len: %d), repl: (%p, len: %d), pad: %d",
+                       a->cpuid >> 5,
+                       a->cpuid & 0x1f,
+                       instr, a->instrlen,
+                       replacement, a->replacementlen, a->padlen);
+ 
+-              DUMP_BYTES(instr, a->instrlen, "%px: old_insn: ", instr);
+-              DUMP_BYTES(replacement, a->replacementlen, "%px: rpl_insn: ", replacement);
++              DUMP_BYTES(instr, a->instrlen, "%p: old_insn: ", instr);
++              DUMP_BYTES(replacement, a->replacementlen, "%p: rpl_insn: ", replacement);
+ 
+               memcpy(insnbuf, replacement, a->replacementlen);
+               insnbuf_sz = a->replacementlen;
+@@ -422,7 +422,7 @@ void __init_or_module noinline apply_alt
+                                a->instrlen - a->replacementlen);
+                       insnbuf_sz += a->instrlen - a->replacementlen;
+               }
+-              DUMP_BYTES(insnbuf, insnbuf_sz, "%px: final_insn: ", instr);
++              DUMP_BYTES(insnbuf, insnbuf_sz, "%p: final_insn: ", instr);
+ 
+               text_poke_early(instr, insnbuf, insnbuf_sz);
+       }

diff --git a/queue-4.14/series b/queue-4.14/series
index a02c5cdc26c93be81936a92d9ad16517551d43f2..17a306c5bd2837bab016bb10e33fbd7949234b47 100644 (file)
--- a/queue-4.14/series
+++ b/queue-4.14/series
@@ -20,3 +20,4 @@ crypto-tcrypt-fix-s-g-table-for-test_aead_speed.patch
 arch-define-weak-abort.patch
 kernel-exit.c-export-abort-to-modules.patch
 scsi-storvsc-missing-error-code-in-storvsc_probe.patch
+revert-x86-alternative-print-unadorned-pointers.patch