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

Commit 7b051f66 authored by Anton Blanchard's avatar Anton Blanchard Committed by Michael Ellerman
Browse files

powerpc: Use probe_kernel_address in show_instructions 



We really don't want to take a pagefault in show_instructions,
so use probe_kernel_address instead of __get_user.

Signed-off-by: default avatarAnton Blanchard <anton@samba.org>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent dd521d1e

arch/powerpc/kernel/process.c

+2 −6
Original line number Diff line number Diff line
@@ -37,9 +37,9 @@ 
#include <linux/personality.h>

#include <linux/random.h>

#include <linux/hw_breakpoint.h>

#include <linux/uaccess.h>



#include <asm/pgtable.h>

#include <asm/uaccess.h>

#include <asm/io.h>

#include <asm/processor.h>

#include <asm/mmu.h>
@@ -921,12 +921,8 @@ static void show_instructions(struct pt_regs *regs) 
			pc = (unsigned long)phys_to_virt(pc);

#endif



		/* We use __get_user here *only* to avoid an OOPS on a

		 * bad address because the pc *should* only be a

		 * kernel address.

		 */

		if (!__kernel_text_address(pc) ||

		     __get_user(instr, (unsigned int __user *)pc)) {

		     probe_kernel_address((unsigned int __user *)pc, instr)) {

			printk(KERN_CONT "XXXXXXXX ");

		} else {

			if (regs->nip == pc)