From: "Aneesh Kumar K.V" <aneesh.kumar@linux.ibm.com>
To: linuxppc-dev@lists.ozlabs.org, mpe@ellerman.id.au
Cc: "Aneesh Kumar K.V" <aneesh.kumar@linux.ibm.com>,
linuxram@us.ibm.com, npiggin@gmail.com
Subject: [RFC PATCH 01/25] powerpc/book3s64/pkeys: Mark all the pkeys above max pkey as reserved
Date: Mon, 27 Apr 2020 13:34:42 +0530 [thread overview]
Message-ID: <20200427080507.1626327-2-aneesh.kumar@linux.ibm.com> (raw)
In-Reply-To: <20200427080507.1626327-1-aneesh.kumar@linux.ibm.com>
The hypervisor can return less than max allowed pkey (for ex: 31) instead
of 32. We should mark all the pkeys above max allowed as reserved so
that we avoid the allocation of the wrong pkey(for ex: key 31 in the above
case) by userspace.
Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.ibm.com>
---
arch/powerpc/mm/book3s64/pkeys.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/arch/powerpc/mm/book3s64/pkeys.c b/arch/powerpc/mm/book3s64/pkeys.c
index 78aaa9300ac2..0303df9368e1 100644
--- a/arch/powerpc/mm/book3s64/pkeys.c
+++ b/arch/powerpc/mm/book3s64/pkeys.c
@@ -175,9 +175,10 @@ static int pkey_initialize(void)
/*
* Prevent the usage of OS reserved keys. Update UAMOR
- * for those keys.
+ * for those keys. Also mark the rest of the bits in the
+ * 32 bit mask as reserved.
*/
- for (i = max_pkey; i < pkeys_total; i++) {
+ for (i = max_pkey; i < 32 ; i++) {
reserved_allocation_mask |= (0x1 << i);
default_uamor &= ~(0x3ul << pkeyshift(i));
}
--
2.25.3
next prev parent reply other threads:[~2020-04-27 8:11 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-27 8:04 [RFC PATCH 00/25] Kernel userspace access/execution prevention with hash translation Aneesh Kumar K.V
2020-04-27 8:04 ` Aneesh Kumar K.V [this message]
2020-04-27 8:04 ` [RFC PATCH 02/25] powerpc/book3s64/pkeys: Enable MMU_FTR_PKEY Aneesh Kumar K.V
2020-04-27 8:04 ` [RFC PATCH 03/25] powerpc/book3s64/kuep: Add MMU_FTR_KUEP Aneesh Kumar K.V
2020-04-27 8:04 ` [RFC PATCH 04/25] powerpc/book3s64/pkeys: Use execute_pkey_disable static key Aneesh Kumar K.V
2020-04-27 8:04 ` [RFC PATCH 05/25] powerpc/book3s64/pkeys: Use MMU_FTR_PKEY instead of pkey_disabled " Aneesh Kumar K.V
2020-04-27 8:04 ` [RFC PATCH 06/25] powerpc/book3s64/kuap: Move KUAP related function outside radix Aneesh Kumar K.V
2020-04-27 8:04 ` [RFC PATCH 07/25] powerpc/book3s64/kuep: Move KUEP " Aneesh Kumar K.V
2020-04-27 8:04 ` [RFC PATCH 08/25] powerpc/book3s64/kuap: Rename MMU_FTR_RADIX_KUAP to MMU_FTR_KUAP Aneesh Kumar K.V
2020-04-27 8:04 ` [RFC PATCH 09/25] powerpc/book3s64/kuap/kuep: Make KUAP and KUEP a subfeature of PPC_MEM_KEYS Aneesh Kumar K.V
2020-04-27 8:04 ` [RFC PATCH 10/25] powerpc/book3s64/kuap: Move UAMOR setup to key init function Aneesh Kumar K.V
2020-04-27 8:04 ` [RFC PATCH 11/25] powerpc/book3s64/kuap: Use Key 3 for kernel mapping with hash translation Aneesh Kumar K.V
2020-04-27 8:04 ` [RFC PATCH 12/25] powerpc/exec: Set thread.regs early during exec Aneesh Kumar K.V
2020-04-27 8:04 ` [RFC PATCH 13/25] powerpc/book3s64/pkeys: Store/restore userspace AMR correctly on entry and exit from kernel Aneesh Kumar K.V
2020-04-27 8:04 ` [RFC PATCH 14/25] powerpc/book3s64/kuep: Store/restore userspace IAMR " Aneesh Kumar K.V
2020-04-27 8:04 ` [RFC PATCH 15/25] powerpc/book3s64/pkeys: Inherit correctly on fork Aneesh Kumar K.V
2020-04-27 8:04 ` [RFC PATCH 16/25] powerpc/book3s64/pkeys: Reset userspace AMR correctly on exec Aneesh Kumar K.V
2020-04-27 8:04 ` [RFC PATCH 17/25] powerpc/ptrace-view: Use pt_regs values instead of thread_struct based one Aneesh Kumar K.V
2020-04-27 8:04 ` [RFC PATCH 18/25] powerpc/book3s64/pkeys: Don't update SPRN_AMR when in kernel mode Aneesh Kumar K.V
2020-04-27 8:05 ` [RFC PATCH 19/25] powerpc/book3s64/kuap: Restrict access to userspace based on userspace AMR Aneesh Kumar K.V
2020-04-27 8:05 ` [RFC PATCH 20/25] powerpc/book3s64/kuap: Improve error reporting with KUAP Aneesh Kumar K.V
2020-04-27 8:05 ` [RFC PATCH 21/25] powerpc/book3s64/kuap: Use Key 3 to implement KUAP with hash translation Aneesh Kumar K.V
2020-04-27 8:05 ` [RFC PATCH 22/25] powerpc/book3s64/kuep: Use Key 3 to implement KUEP " Aneesh Kumar K.V
2020-04-27 8:05 ` [RFC PATCH 23/25] powerpc/book3s64/hash/kuap: Enable kuap on hash Aneesh Kumar K.V
2020-04-27 8:05 ` [RFC PATCH 24/25] powerpc/book3s64/hash/kuep: Enable KUEP " Aneesh Kumar K.V
2020-04-27 8:05 ` [RFC PATCH 25/25] powerpc/book3s64/keys: Print information during boot Aneesh Kumar K.V
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=20200427080507.1626327-2-aneesh.kumar@linux.ibm.com \
--to=aneesh.kumar@linux.ibm.com \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=linuxram@us.ibm.com \
--cc=mpe@ellerman.id.au \
--cc=npiggin@gmail.com \
/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).