Unverified Commit bb89783b authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!8297 v2 powerpc/mm: Fix lockup on kernel exec fault 

Merge Pull Request from: @ci-robot 
 
PR sync from: Liu Shixin <liushixin2@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/EQLGBJEFOECYUVK2UV33YS73B6Z47F7I/ 
 
https://gitee.com/src-openeuler/kernel/issues/I9R4CI 
 
Link:https://gitee.com/openeuler/kernel/pulls/8297

 

Reviewed-by: default avatarLiu YongQiang <liuyongqiang13@huawei.com>
Signed-off-by: default avatarZhang Changzhong <zhangchangzhong@huawei.com>
parents 5092df3d 40e2d67c

arch/powerpc/mm/fault.c

+1 −3
Original line number Diff line number Diff line
@@ -221,9 +221,7 @@ static int mm_fault_error(struct pt_regs *regs, unsigned long addr, 
static bool bad_kernel_fault(bool is_exec, unsigned long error_code,

			     unsigned long address)

{

	/* NX faults set DSISR_PROTFAULT on the 8xx, DSISR_NOEXEC_OR_G on others */

	if (is_exec && (error_code & (DSISR_NOEXEC_OR_G | DSISR_KEYFAULT |

				      DSISR_PROTFAULT))) {

	if (is_exec) {

		printk_ratelimited(KERN_CRIT "kernel tried to execute"

				   " exec-protected page (%lx) -"

				   "exploit attempt? (uid: %d)\n",