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

Commit ba6d018e authored by Nicolas Iooss's avatar Nicolas Iooss Committed by Thomas Gleixner
Browse files

x86/mm/pkeys: Do not skip PKRU register if debug registers are not used 



__show_regs() fails to dump the PKRU state when the debug registers are in
their default state because there is a return statement on the debug
register state.

Change the logic to report PKRU value even when debug registers are in
their default state.

Fixes:c0b17b5b ("x86/mm/pkeys: Dump PKRU with other kernel registers")
Signed-off-by: default avatarNicolas Iooss <nicolas.iooss_linux@m4x.org>
Acked-by: default avatarDave Hansen <dave.hansen@linux.intel.com>
Link: http://lkml.kernel.org/r/20160910183045.4618-1-nicolas.iooss_linux@m4x.org


Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent e2753293

arch/x86/kernel/process_64.c

+7 −6
Original line number Diff line number Diff line
@@ -110,12 +110,13 @@ void __show_regs(struct pt_regs *regs, int all) 
	get_debugreg(d7, 7);



	/* Only print out debug registers if they are in their non-default state. */

	if ((d0 == 0) && (d1 == 0) && (d2 == 0) && (d3 == 0) &&

	    (d6 == DR6_RESERVED) && (d7 == 0x400))

		return;



	printk(KERN_DEFAULT "DR0: %016lx DR1: %016lx DR2: %016lx\n", d0, d1, d2);

	printk(KERN_DEFAULT "DR3: %016lx DR6: %016lx DR7: %016lx\n", d3, d6, d7);

	if (!((d0 == 0) && (d1 == 0) && (d2 == 0) && (d3 == 0) &&

	    (d6 == DR6_RESERVED) && (d7 == 0x400))) {

		printk(KERN_DEFAULT "DR0: %016lx DR1: %016lx DR2: %016lx\n",

		       d0, d1, d2);

		printk(KERN_DEFAULT "DR3: %016lx DR6: %016lx DR7: %016lx\n",

		       d3, d6, d7);

	}



	if (boot_cpu_has(X86_FEATURE_OSPKE))

		printk(KERN_DEFAULT "PKRU: %08x\n", read_pkru());