Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d2aeb4e2 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Revert "x86/alternative: Print unadorned pointers" 



This reverts commit 67eb59b8.

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: default avatarKees Cook <keescook@google.com>
Acked-by: default avatarBorislav 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: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 22f16a74

arch/x86/kernel/alternative.c

+7 −7
Original line number Diff line number Diff line
@@ -287,7 +287,7 @@ recompute_jump(struct alt_instr *a, u8 *orig_insn, u8 *repl_insn, u8 *insnbuf) 
	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 optimize_nops(struct alt_instr *a, u8 *ins 
	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_alternatives(struct alt_instr *start, 
	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_alternatives(struct alt_instr *start, 
			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_alternatives(struct alt_instr *start, 
				 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);

	}