From: Balbir Singh <bsingharora@gmail.com>
To: linuxppc-dev <linuxppc-dev@ozlabs.org>,
Michael Ellerman <mpe@ellerman.id.au>
Subject: [PATCH 2/3] Detect instruction fetch denied and report
Date: Wed, 2 Nov 2016 00:38:19 +1100 [thread overview]
Message-ID: <1478007500-23624-3-git-send-email-bsingharora@gmail.com> (raw)
In-Reply-To: <1478007500-23624-1-git-send-email-bsingharora@gmail.com>
ISA 3 allows for prevention of instruction fetch and execution
of user mode pages. If such an error occurs, SRR1 bit 35
reports the error. We catch and report the error in do_page_fault()
Signed-off-by: Balbir Singh <bsingharora@gmail.com>
---
arch/powerpc/mm/fault.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/arch/powerpc/mm/fault.c b/arch/powerpc/mm/fault.c
index d0b137d..835fd03 100644
--- a/arch/powerpc/mm/fault.c
+++ b/arch/powerpc/mm/fault.c
@@ -404,6 +404,10 @@ int do_page_fault(struct pt_regs *regs, unsigned long address,
(cpu_has_feature(CPU_FTR_NOEXECUTE) ||
!(vma->vm_flags & (VM_READ | VM_WRITE))))
goto bad_area;
+
+ if (radix_enabled() && (regs->msr & SRR1_ISI_N_OR_G))
+ goto bad_area;
+
#ifdef CONFIG_PPC_STD_MMU
/*
* protfault should only happen due to us
--
2.5.5
next prev parent reply other threads:[~2016-11-01 13:39 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-11-01 13:38 [PATCH 0/3] Enable IAMR storage keys for radix Balbir Singh
2016-11-01 13:38 ` [PATCH 1/3] Setup AMOR in HV mode Balbir Singh
2016-11-08 15:13 ` Aneesh Kumar K.V
2016-11-11 6:15 ` Balbir Singh
2016-11-01 13:38 ` Balbir Singh [this message]
2016-11-08 16:09 ` [PATCH 2/3] Detect instruction fetch denied and report Aneesh Kumar K.V
2016-11-11 6:14 ` Balbir Singh
2016-11-08 16:16 ` Aneesh Kumar K.V
2016-11-01 13:38 ` [PATCH 3/3] Enable storage keys for radix - user mode execution Balbir Singh
2016-11-08 16:15 ` Aneesh Kumar K.V
2016-11-11 6:02 ` Balbir Singh
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1478007500-23624-3-git-send-email-bsingharora@gmail.com \
--to=bsingharora@gmail.com \
--cc=linuxppc-dev@ozlabs.org \
--cc=mpe@ellerman.id.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).