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

Commit e8b6f984 authored by Borislav Petkov's avatar Borislav Petkov Committed by Thomas Gleixner
Browse files

x86/dumpstack: Add loglevel argument to show_opcodes() 



Will be used in the next patch.

Signed-off-by: default avatarBorislav Petkov <bp@suse.de>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Josh Poimboeuf <jpoimboe@redhat.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Andy Lutomirski <luto@amacapital.net>
Link: https://lkml.kernel.org/r/20180417161124.5294-6-bp@alien8.de
parent 9e4a90fd

arch/x86/include/asm/stacktrace.h

+1 −0
Original line number Diff line number Diff line
@@ -111,4 +111,5 @@ static inline unsigned long caller_frame_pointer(void) 
	return (unsigned long)frame;

}



void show_opcodes(u8 *rip, const char *loglvl);

#endif /* _ASM_X86_STACKTRACE_H */

arch/x86/kernel/dumpstack.c

+3 −3
Original line number Diff line number Diff line
@@ -70,14 +70,14 @@ static void printk_stack_address(unsigned long address, int reliable, 
	printk("%s %s%pB\n", log_lvl, reliable ? "" : "? ", (void *)address);

}



static void show_opcodes(u8 *rip)

void show_opcodes(u8 *rip, const char *loglvl)

{

	unsigned int code_prologue = OPCODE_BUFSIZE * 2 / 3;

	u8 opcodes[OPCODE_BUFSIZE];

	u8 *ip;

	int i;



	printk(KERN_DEFAULT "Code: ");

	printk("%sCode: ", loglvl);



	ip = (u8 *)rip - code_prologue;

	if (probe_kernel_read(opcodes, ip, OPCODE_BUFSIZE)) {
@@ -401,6 +401,6 @@ void show_regs(struct pt_regs *regs) 
		if (regs->ip < PAGE_OFFSET)

			printk(KERN_DEFAULT "Code: Bad RIP value.\n");

		else

			show_opcodes((u8 *)regs->ip);

			show_opcodes((u8 *)regs->ip, KERN_DEFAULT);

	}

}