From: Khalid Aziz <khalid.aziz@oracle.com>
To: akpm@linux-foundation.org, benh@kernel.crashing.org,
paulus@samba.org, mpe@ellerman.id.au, davem@davemloft.net,
dave.hansen@linux.intel.com
Cc: Khalid Aziz <khalid.aziz@oracle.com>,
bsingharora@gmail.com, nborisov@suse.com, aarcange@redhat.com,
tj@kernel.org, mgorman@suse.de, vbabka@suse.cz,
nadav.amit@gmail.com, aneesh.kumar@linux.vnet.ibm.com,
kirill.shutemov@linux.intel.com, heiko.carstens@de.ibm.com,
ak@linux.intel.com, linuxppc-dev@lists.ozlabs.org,
linux-kernel@vger.kernel.org, linux-mm@kvack.org,
sparclinux@vger.kernel.org, Khalid Aziz <khalid@gonehiking.org>
Subject: [PATCH v8 7/9] mm: Add address parameter to arch_validate_prot()
Date: Mon, 25 Sep 2017 10:48:58 -0600 [thread overview]
Message-ID: <e4b6fcaa267628f7ef8fdbe60f05ec8d4d60b3be.1506089472.git.khalid.aziz@oracle.com> (raw)
In-Reply-To: <cover.1506089472.git.khalid.aziz@oracle.com>
In-Reply-To: <cover.1506089472.git.khalid.aziz@oracle.com>
A protection flag may not be valid across entire address space and
hence arch_validate_prot() might need the address a protection bit is
being set on to ensure it is a valid protection flag. For example, sparc
processors support memory corruption detection (as part of ADI feature)
flag on memory addresses mapped on to physical RAM but not on PFN mapped
pages or addresses mapped on to devices. This patch adds address to the
parameters being passed to arch_validate_prot() so protection bits can
be validated in the relevant context.
Signed-off-by: Khalid Aziz <khalid.aziz@oracle.com>
Cc: Khalid Aziz <khalid@gonehiking.org>
---
v8:
- Added addr parameter to powerpc arch_validate_prot() (suggested
by Michael Ellerman)
v7:
- new patch
arch/powerpc/include/asm/mman.h | 4 ++--
arch/powerpc/kernel/syscalls.c | 2 +-
include/linux/mman.h | 2 +-
mm/mprotect.c | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/arch/powerpc/include/asm/mman.h b/arch/powerpc/include/asm/mman.h
index 30922f699341..1d129f4521ac 100644
--- a/arch/powerpc/include/asm/mman.h
+++ b/arch/powerpc/include/asm/mman.h
@@ -32,7 +32,7 @@ static inline pgprot_t arch_vm_get_page_prot(unsigned long vm_flags)
}
#define arch_vm_get_page_prot(vm_flags) arch_vm_get_page_prot(vm_flags)
-static inline bool arch_validate_prot(unsigned long prot)
+static inline bool arch_validate_prot(unsigned long prot, unsigned long addr)
{
if (prot & ~(PROT_READ | PROT_WRITE | PROT_EXEC | PROT_SEM | PROT_SAO))
return false;
@@ -40,7 +40,7 @@ static inline bool arch_validate_prot(unsigned long prot)
return false;
return true;
}
-#define arch_validate_prot(prot) arch_validate_prot(prot)
+#define arch_validate_prot arch_validate_prot
#endif /* CONFIG_PPC64 */
#endif /* _ASM_POWERPC_MMAN_H */
diff --git a/arch/powerpc/kernel/syscalls.c b/arch/powerpc/kernel/syscalls.c
index a877bf8269fe..6d90ddbd2d11 100644
--- a/arch/powerpc/kernel/syscalls.c
+++ b/arch/powerpc/kernel/syscalls.c
@@ -48,7 +48,7 @@ static inline long do_mmap2(unsigned long addr, size_t len,
{
long ret = -EINVAL;
- if (!arch_validate_prot(prot))
+ if (!arch_validate_prot(prot, addr))
goto out;
if (shift) {
diff --git a/include/linux/mman.h b/include/linux/mman.h
index c8367041fafd..b42ad5c9d6a2 100644
--- a/include/linux/mman.h
+++ b/include/linux/mman.h
@@ -49,7 +49,7 @@ static inline void vm_unacct_memory(long pages)
*
* Returns true if the prot flags are valid
*/
-static inline bool arch_validate_prot(unsigned long prot)
+static inline bool arch_validate_prot(unsigned long prot, unsigned long addr)
{
return (prot & ~(PROT_READ | PROT_WRITE | PROT_EXEC | PROT_SEM)) == 0;
}
diff --git a/mm/mprotect.c b/mm/mprotect.c
index bd0f409922cb..4f0e46bb1797 100644
--- a/mm/mprotect.c
+++ b/mm/mprotect.c
@@ -395,7 +395,7 @@ static int do_mprotect_pkey(unsigned long start, size_t len,
end = start + len;
if (end <= start)
return -ENOMEM;
- if (!arch_validate_prot(prot))
+ if (!arch_validate_prot(prot, start))
return -EINVAL;
reqprot = prot;
--
2.11.0
next prev parent reply other threads:[~2017-09-25 16:51 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-09-25 16:48 [PATCH v8 0/9] Application Data Integrity feature introduced by SPARC M7 Khalid Aziz
2017-09-25 16:48 ` [PATCH v8 1/9] signals, sparc: Add signal codes for ADI violations Khalid Aziz
2017-09-25 16:48 ` [PATCH v8 2/9] mm, swap: Add infrastructure for saving page metadata as well on swap Khalid Aziz
2017-09-25 16:48 ` [PATCH v8 3/9] sparc64: Add support for ADI register fields, ASIs and traps Khalid Aziz
2017-09-25 16:48 ` [PATCH v8 4/9] sparc64: Add HV fault type handlers for ADI related faults Khalid Aziz
2017-09-25 16:48 ` [PATCH v8 5/9] sparc64: Add handler for "Memory Corruption Detected" trap Khalid Aziz
2017-09-25 16:48 ` [PATCH v8 6/9] sparc64: Add auxiliary vectors to report platform ADI properties Khalid Aziz
2017-09-25 16:48 ` Khalid Aziz [this message]
2017-09-25 16:48 ` [PATCH v8 8/9] mm: Clear arch specific VM flags on protection change Khalid Aziz
2017-09-25 16:49 ` [PATCH v8 9/9] sparc64: Add support for ADI (Application Data Integrity) Khalid Aziz
2017-10-06 22:12 ` Anthony Yznaga
2017-10-12 14:44 ` Khalid Aziz
2017-10-12 20:27 ` Anthony Yznaga
2017-10-13 14:14 ` Khalid Aziz
2017-10-13 16:18 ` Khalid Aziz
2017-10-13 17:19 ` Anthony Yznaga
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=e4b6fcaa267628f7ef8fdbe60f05ec8d4d60b3be.1506089472.git.khalid.aziz@oracle.com \
--to=khalid.aziz@oracle.com \
--cc=aarcange@redhat.com \
--cc=ak@linux.intel.com \
--cc=akpm@linux-foundation.org \
--cc=aneesh.kumar@linux.vnet.ibm.com \
--cc=benh@kernel.crashing.org \
--cc=bsingharora@gmail.com \
--cc=dave.hansen@linux.intel.com \
--cc=davem@davemloft.net \
--cc=heiko.carstens@de.ibm.com \
--cc=khalid@gonehiking.org \
--cc=kirill.shutemov@linux.intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=mgorman@suse.de \
--cc=mpe@ellerman.id.au \
--cc=nadav.amit@gmail.com \
--cc=nborisov@suse.com \
--cc=paulus@samba.org \
--cc=sparclinux@vger.kernel.org \
--cc=tj@kernel.org \
--cc=vbabka@suse.cz \
/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).