From: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
To: linux-kernel@vger.kernel.org, x86@kernel.org, linux-sgx@vger.kernel.org
Cc: akpm@linux-foundation.org, dave.hansen@intel.com,
sean.j.christopherson@intel.com, nhorman@redhat.com,
npmccallum@redhat.com, haitao.huang@intel.com,
andriy.shevchenko@linux.intel.com, tglx@linutronix.de,
kai.svahn@intel.com, bp@alien8.de, josh@joshtriplett.org,
luto@kernel.org, kai.huang@intel.com, rientjes@google.com,
cedric.xing@intel.com, puiterwijk@redhat.com,
Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Subject: [PATCH v28 10/22] mm: Introduce vm_ops->may_mprotect()
Date: Wed, 4 Mar 2020 01:35:57 +0200 [thread overview]
Message-ID: <20200303233609.713348-11-jarkko.sakkinen@linux.intel.com> (raw)
In-Reply-To: <20200303233609.713348-1-jarkko.sakkinen@linux.intel.com>
From: Sean Christopherson <sean.j.christopherson@intel.com>
Add vm_ops()->may_mprotect() to check additional constrains set by a
subsystem for a mprotect() call.
Signed-off-by: Sean Christopherson <sean.j.christopherson@intel.com>
Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
---
include/linux/mm.h | 2 ++
mm/mprotect.c | 14 +++++++++++---
2 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/include/linux/mm.h b/include/linux/mm.h
index 52269e56c514..ad08eb666e1c 100644
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -464,6 +464,8 @@ struct vm_operations_struct {
void (*close)(struct vm_area_struct * area);
int (*split)(struct vm_area_struct * area, unsigned long addr);
int (*mremap)(struct vm_area_struct * area);
+ int (*may_mprotect)(struct vm_area_struct *vma, unsigned long start,
+ unsigned long end, unsigned long prot);
vm_fault_t (*fault)(struct vm_fault *vmf);
vm_fault_t (*huge_fault)(struct vm_fault *vmf,
enum page_entry_size pe_size);
diff --git a/mm/mprotect.c b/mm/mprotect.c
index 7a8e84f86831..c0cb40e23b43 100644
--- a/mm/mprotect.c
+++ b/mm/mprotect.c
@@ -543,13 +543,21 @@ static int do_mprotect_pkey(unsigned long start, size_t len,
goto out;
}
+ tmp = vma->vm_end;
+ if (tmp > end)
+ tmp = end;
+
+ if (vma->vm_ops && vma->vm_ops->may_mprotect) {
+ error = vma->vm_ops->may_mprotect(vma, nstart, tmp,
+ prot);
+ if (error)
+ goto out;
+ }
+
error = security_file_mprotect(vma, reqprot, prot);
if (error)
goto out;
- tmp = vma->vm_end;
- if (tmp > end)
- tmp = end;
error = mprotect_fixup(vma, &prev, nstart, tmp, newflags);
if (error)
goto out;
--
2.25.0
next prev parent reply other threads:[~2020-03-03 23:38 UTC|newest]
Thread overview: 110+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-03 23:35 [PATCH v28 00/22] Intel SGX foundations Jarkko Sakkinen
2020-03-03 23:35 ` [PATCH v28 01/22] x86/sgx: Update MAINTAINERS Jarkko Sakkinen
2020-03-03 23:35 ` [PATCH v28 02/22] x86/cpufeatures: x86/msr: Add Intel SGX hardware bits Jarkko Sakkinen
2020-03-03 23:35 ` [PATCH v28 03/22] x86/cpufeatures: x86/msr: Intel SGX Launch Control " Jarkko Sakkinen
2020-03-03 23:35 ` [PATCH v28 04/22] x86/mm: x86/sgx: Signal SIGSEGV with PF_SGX Jarkko Sakkinen
2020-03-03 23:35 ` [PATCH v28 05/22] x86/sgx: Add SGX microarchitectural data structures Jarkko Sakkinen
2020-03-03 23:35 ` [PATCH v28 06/22] x86/sgx: Add wrappers for ENCLS leaf functions Jarkko Sakkinen
2020-03-09 21:14 ` Sean Christopherson
2020-03-03 23:35 ` [PATCH v28 07/22] x86/cpu/intel: Detect SGX supprt Jarkko Sakkinen
2020-03-09 21:56 ` Sean Christopherson
2020-03-11 17:03 ` Jarkko Sakkinen
2020-03-03 23:35 ` [PATCH v28 08/22] x86/sgx: Enumerate and track EPC sections Jarkko Sakkinen
2020-03-03 23:35 ` [PATCH v28 09/22] x86/sgx: Add functions to allocate and free EPC pages Jarkko Sakkinen
2020-03-03 23:35 ` Jarkko Sakkinen [this message]
2020-03-03 23:35 ` [PATCH v28 11/22] x86/sgx: Linux Enclave Driver Jarkko Sakkinen
2020-03-05 17:40 ` Sean Christopherson
2020-03-05 18:24 ` Jethro Beekman
2020-03-05 19:04 ` Sean Christopherson
2020-03-06 19:00 ` Jarkko Sakkinen
2020-03-19 18:22 ` Dr. Greg
2020-03-06 18:58 ` Jarkko Sakkinen
2020-03-03 23:35 ` [PATCH v28 12/22] docs: x86/sgx: Document SGX micro architecture and kernel internals Jarkko Sakkinen
2020-03-03 23:36 ` [PATCH v28 13/22] selftests/x86: Recurse into subdirectories Jarkko Sakkinen
2020-03-03 23:36 ` [PATCH v28 14/22] selftests/x86: Add a selftest for SGX Jarkko Sakkinen
2020-03-04 19:27 ` Nathaniel McCallum
2020-03-05 11:33 ` Jarkko Sakkinen
2020-03-06 15:42 ` Dr. Greg
2020-03-06 19:07 ` Jarkko Sakkinen
2020-03-07 17:42 ` Dr. Greg
2020-03-10 13:08 ` Jarkko Sakkinen
2020-03-11 13:28 ` Jarkko Sakkinen
2020-03-11 16:40 ` Sean Christopherson
2020-03-13 19:24 ` Jarkko Sakkinen
2020-03-04 19:44 ` Nathaniel McCallum
2020-03-04 19:51 ` Nathaniel McCallum
2020-03-06 5:32 ` Dr. Greg
2020-03-06 19:04 ` Jarkko Sakkinen
2020-03-10 19:29 ` Haitao Huang
2020-03-11 9:13 ` Dr. Greg
2020-03-11 17:15 ` Haitao Huang
2020-03-17 1:07 ` Dr. Greg
2020-03-03 23:36 ` [PATCH v28 15/22] x86/sgx: Add provisioning Jarkko Sakkinen
2020-03-03 23:36 ` [PATCH v28 16/22] x86/sgx: Add a page reclaimer Jarkko Sakkinen
2020-03-05 19:03 ` Sean Christopherson
2020-03-06 18:47 ` Jarkko Sakkinen
2020-03-12 18:38 ` Sean Christopherson
2020-03-15 0:27 ` Jarkko Sakkinen
2020-03-15 1:17 ` Jarkko Sakkinen
2020-03-09 21:16 ` Sean Christopherson
2020-03-03 23:36 ` [PATCH v28 17/22] x86/sgx: ptrace() support for the SGX driver Jarkko Sakkinen
2020-03-03 23:36 ` [PATCH v28 18/22] x86/vdso: Add support for exception fixup in vDSO functions Jarkko Sakkinen
2020-03-03 23:36 ` [PATCH v28 19/22] x86/fault: Add helper function to sanitize error code Jarkko Sakkinen
2020-03-03 23:36 ` [PATCH v28 20/22] x86/traps: Attempt to fixup exceptions in vDSO before signaling Jarkko Sakkinen
2020-03-03 23:36 ` [PATCH v28 21/22] x86/vdso: Implement a vDSO for Intel SGX enclave call Jarkko Sakkinen
2020-03-11 17:30 ` Nathaniel McCallum
2020-03-11 17:38 ` Jethro Beekman
2020-03-11 19:15 ` Nathaniel McCallum
2020-03-13 15:48 ` Nathaniel McCallum
2020-03-13 16:46 ` Sean Christopherson
2020-03-13 18:32 ` Nathaniel McCallum
2020-03-13 18:44 ` Sean Christopherson
2020-03-13 20:14 ` Nathaniel McCallum
2020-03-13 22:08 ` Sean Christopherson
2020-03-14 14:10 ` Nathaniel McCallum
2020-03-18 23:40 ` Sean Christopherson
2020-03-19 0:38 ` Xing, Cedric
2020-03-19 1:03 ` Sean Christopherson
2020-03-20 13:55 ` Nathaniel McCallum
2020-03-15 1:25 ` Jarkko Sakkinen
2020-03-15 17:53 ` Nathaniel McCallum
2020-03-16 13:31 ` Jethro Beekman
2020-03-16 13:57 ` Nathaniel McCallum
2020-03-16 13:59 ` Jethro Beekman
2020-03-16 14:03 ` Nathaniel McCallum
2020-03-16 17:17 ` Sean Christopherson
2020-03-16 21:27 ` Jarkko Sakkinen
2020-03-16 21:29 ` Jarkko Sakkinen
2020-03-16 22:55 ` Sean Christopherson
2020-03-16 23:56 ` Xing, Cedric
2020-03-18 22:01 ` Jarkko Sakkinen
2020-03-18 22:18 ` Jarkko Sakkinen
2020-03-16 13:56 ` Jarkko Sakkinen
2020-03-16 14:01 ` Nathaniel McCallum
2020-03-16 21:38 ` Jarkko Sakkinen
2020-03-16 22:53 ` Sean Christopherson
2020-03-16 23:50 ` Xing, Cedric
2020-03-16 23:59 ` Sean Christopherson
2020-03-17 0:18 ` Xing, Cedric
2020-03-17 0:27 ` Sean Christopherson
2020-03-17 16:37 ` Nathaniel McCallum
2020-03-17 16:50 ` Nathaniel McCallum
2020-03-17 21:40 ` Xing, Cedric
2020-03-17 22:09 ` Sean Christopherson
2020-03-17 22:36 ` Xing, Cedric
2020-03-17 23:57 ` Sean Christopherson
2020-03-17 22:23 ` Xing, Cedric
2020-03-18 13:01 ` Nathaniel McCallum
2020-03-20 15:53 ` Nathaniel McCallum
2020-03-17 16:28 ` Nathaniel McCallum
2020-03-18 22:58 ` Jarkko Sakkinen
2020-03-18 22:39 ` Jarkko Sakkinen
2020-03-11 19:30 ` Nathaniel McCallum
2020-03-13 0:52 ` Sean Christopherson
2020-03-13 16:07 ` Nathaniel McCallum
2020-03-13 16:33 ` Sean Christopherson
2020-03-03 23:36 ` [PATCH v28 22/22] selftests/x86: Add vDSO selftest for SGX Jarkko Sakkinen
2020-03-04 19:24 ` [PATCH v28 00/22] Intel SGX foundations Nathaniel McCallum
2020-03-17 16:00 ` Jordan Hand
2020-03-18 21:56 ` Jarkko Sakkinen
2020-03-19 17:16 ` Dr. Greg
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=20200303233609.713348-11-jarkko.sakkinen@linux.intel.com \
--to=jarkko.sakkinen@linux.intel.com \
--cc=akpm@linux-foundation.org \
--cc=andriy.shevchenko@linux.intel.com \
--cc=bp@alien8.de \
--cc=cedric.xing@intel.com \
--cc=dave.hansen@intel.com \
--cc=haitao.huang@intel.com \
--cc=josh@joshtriplett.org \
--cc=kai.huang@intel.com \
--cc=kai.svahn@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-sgx@vger.kernel.org \
--cc=luto@kernel.org \
--cc=nhorman@redhat.com \
--cc=npmccallum@redhat.com \
--cc=puiterwijk@redhat.com \
--cc=rientjes@google.com \
--cc=sean.j.christopherson@intel.com \
--cc=tglx@linutronix.de \
--cc=x86@kernel.org \
/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).