mirror of
https://github.com/hardkernel/linux.git
synced 2026-06-07 19:30:30 +09:00
UPSTREAM: arm64: Add support for user sub-page fault probing
With MTE, even if the pte allows an access, a mismatched tag somewhere
within a page can still cause a fault. Select ARCH_HAS_SUBPAGE_FAULTS if
MTE is enabled and implement the probe_subpage_writeable() function.
Note that get_user() is sufficient for the writeable MTE check since the
same tag mismatch fault would be triggered by a read. The caller of
probe_subpage_writeable() will need to check the pte permissions
(put_user, GUP).
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Cc: Will Deacon <will@kernel.org>
Link: https://lore.kernel.org/r/20220423100751.1870771-3-catalin.marinas@arm.com
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Bug: 254721825
(cherry picked from commit f3ba50a7a1)
Change-Id: Ia12bd6d2c49a742794abf5658fb2ddaa063a5b67
Signed-off-by: Andrey Konovalov <andreyknvl@google.com>
This commit is contained in:
committed by
Todd Kjos
parent
e4b506cb0a
commit
329420e403
@@ -1861,6 +1861,7 @@ config ARM64_MTE
|
||||
depends on AS_HAS_LSE_ATOMICS
|
||||
# Required for tag checking in the uaccess routines
|
||||
depends on ARM64_PAN
|
||||
select ARCH_HAS_SUBPAGE_FAULTS
|
||||
select ARCH_USES_HIGH_VMA_FLAGS
|
||||
help
|
||||
Memory Tagging (part of the ARMv8.5 Extensions) provides
|
||||
|
||||
@@ -49,6 +49,7 @@ long set_mte_ctrl(struct task_struct *task, unsigned long arg);
|
||||
long get_mte_ctrl(struct task_struct *task);
|
||||
int mte_ptrace_copy_tags(struct task_struct *child, long request,
|
||||
unsigned long addr, unsigned long data);
|
||||
size_t mte_probe_user_range(const char __user *uaddr, size_t size);
|
||||
|
||||
#else /* CONFIG_ARM64_MTE */
|
||||
|
||||
|
||||
@@ -495,4 +495,19 @@ static inline int __copy_from_user_flushcache(void *dst, const void __user *src,
|
||||
}
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_ARCH_HAS_SUBPAGE_FAULTS
|
||||
|
||||
/*
|
||||
* Return 0 on success, the number of bytes not probed otherwise.
|
||||
*/
|
||||
static inline size_t probe_subpage_writeable(const char __user *uaddr,
|
||||
size_t size)
|
||||
{
|
||||
if (!system_supports_mte())
|
||||
return 0;
|
||||
return mte_probe_user_range(uaddr, size);
|
||||
}
|
||||
|
||||
#endif /* CONFIG_ARCH_HAS_SUBPAGE_FAULTS */
|
||||
|
||||
#endif /* __ASM_UACCESS_H */
|
||||
|
||||
@@ -15,6 +15,7 @@
|
||||
#include <linux/swapops.h>
|
||||
#include <linux/thread_info.h>
|
||||
#include <linux/types.h>
|
||||
#include <linux/uaccess.h>
|
||||
#include <linux/uio.h>
|
||||
|
||||
#include <asm/barrier.h>
|
||||
@@ -602,3 +603,32 @@ static int register_mte_tcf_preferred_sysctl(void)
|
||||
return 0;
|
||||
}
|
||||
subsys_initcall(register_mte_tcf_preferred_sysctl);
|
||||
|
||||
/*
|
||||
* Return 0 on success, the number of bytes not probed otherwise.
|
||||
*/
|
||||
size_t mte_probe_user_range(const char __user *uaddr, size_t size)
|
||||
{
|
||||
const char __user *end = uaddr + size;
|
||||
int err = 0;
|
||||
char val;
|
||||
|
||||
__raw_get_user(val, uaddr, err);
|
||||
if (err)
|
||||
return size;
|
||||
|
||||
uaddr = PTR_ALIGN(uaddr, MTE_GRANULE_SIZE);
|
||||
while (uaddr < end) {
|
||||
/*
|
||||
* A read is sufficient for mte, the caller should have probed
|
||||
* for the pte write permission if required.
|
||||
*/
|
||||
__raw_get_user(val, uaddr, err);
|
||||
if (err)
|
||||
return end - uaddr;
|
||||
uaddr += MTE_GRANULE_SIZE;
|
||||
}
|
||||
(void)val;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user