Revert "arm64: kernel: check mode for get_user in undefinstr" (170bb239) · Commits · e / devices / android_kernel_xiaomi_markw

arch/arm64/kernel/traps.c

+11 −15

Original line number	Diff line number	Diff line
		@@ -289,7 +289,6 @@ asmlinkage void __exception do_undefinstr(struct pt_regs *regs)
		/* check for AArch32 breakpoint instructions */
		if (!aarch32_break_handler(regs))
		return;
		if (user_mode(regs)) {
		if (compat_thumb_mode(regs)) {
		if (get_user(instr, (u16 __user *)pc))
		goto die_sig;
		@@ -300,13 +299,10 @@ asmlinkage void __exception do_undefinstr(struct pt_regs *regs)
		instr <<= 16;
		instr \|= instr2;
		}
		} else if (get_user(instr, (u32 __user *)pc)) {

		} else if ((get_user(instr, (u32 __user *)pc))) {
		goto die_sig;
		}
		} else {
		/* kernel mode */
		instr = ((u32 )pc);
		}

		if (call_undef_hook(regs, instr) == 0)
		return;