diff options
| author | Alexei Starovoitov <ast@kernel.org> | 2026-10-01 14:52:55 +0000 |
|---|---|---|
| committer | Kumar Kartikeya Dwivedi <memxor@gmail.com> | 2026-10-01 18:39:27 +0200 |
| commit | 33a154a96e71a34a1bcca9f40da343dbbf7b38b4 (patch) | |
| tree | 543be8029ab3d8a3a63994ae23385a053ed30029 /include/asm-generic/pgtable_uffd.h | |
| download | linux-stable-33a154a96e71a34a1bcca9f40da343dbbf7b38b4.tar.gz linux-stable-33a154a96e71a34a1bcca9f40da343dbbf7b38b4.zip | |
selftests/bpf: Test packet range of pointers sharing an idgrafted
Add tests where two packet pointers share an id and tightening one
pointer's umax from its var_off would put it less than their constant
distance from the other's umax: with an index & 0x38 capped at 50, the
base pointer keeps umax 50, so the pointer 8 bytes further on must keep
umax 58, even though its known bits allow at most 56.
These refused a valid program or accepted an out-of-bounds access before
the fix:
- check the advanced copy, load through the base: valid, was refused;
- check the base, load the byte at base + 1 through a copy advanced by
8: was accepted;
- check base + 4, load 4 bytes at base + 2 through base + 8: reads two
bytes past the checked range, was accepted;
- the same as the second with data_meta pointers checked against data:
was accepted.
These pass with and without the fix and cover nearby paths:
- subtract an unknown scalar from a checked pointer and load below it
(the range is kept across a new id);
- reach a load through two paths whose checks cover 8 and 7 bytes after
the loaded pointer; the second path must not be pruned by the first;
- spill a copy of a pointer, check the pointer, fill the copy and load
one byte past the checked range: the load is refused, and the copy
has the range of the check.
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Link: https://lore.kernel.org/bpf/20261001145255.855630-2-alexei.starovoitov@gmail.com
Signed-off-by: Kumar Kartikeya Dwivedi <memxor@gmail.com>
Diffstat (limited to 'include/asm-generic/pgtable_uffd.h')
| -rw-r--r-- | include/asm-generic/pgtable_uffd.h | 83 |
1 files changed, 83 insertions, 0 deletions
diff --git a/include/asm-generic/pgtable_uffd.h b/include/asm-generic/pgtable_uffd.h new file mode 100644 index 000000000..30e88fc1d --- /dev/null +++ b/include/asm-generic/pgtable_uffd.h @@ -0,0 +1,83 @@ +#ifndef _ASM_GENERIC_PGTABLE_UFFD_H +#define _ASM_GENERIC_PGTABLE_UFFD_H + +/* + * Some platforms can customize the uffd PTE bit, making it unavailable + * even if the architecture provides the resource. + * Adding this API allows architectures to add their own checks for the + * devices on which the kernel is running. + * Note: When overriding it, please make sure the + * CONFIG_HAVE_ARCH_USERFAULTFD_WP is part of this macro. + */ +#ifndef pgtable_supports_uffd +#define pgtable_supports_uffd() IS_ENABLED(CONFIG_HAVE_ARCH_USERFAULTFD_WP) +#endif + +static inline bool uffd_supports_wp_marker(void) +{ + return pgtable_supports_uffd() && IS_ENABLED(CONFIG_PTE_MARKER_UFFD_WP); +} + +#ifndef CONFIG_HAVE_ARCH_USERFAULTFD_WP +static __always_inline int pte_uffd(pte_t pte) +{ + return 0; +} + +static __always_inline int pmd_uffd(pmd_t pmd) +{ + return 0; +} + +static __always_inline pte_t pte_mkuffd(pte_t pte) +{ + return pte; +} + +static __always_inline pmd_t pmd_mkuffd(pmd_t pmd) +{ + return pmd; +} + +static __always_inline pte_t pte_clear_uffd(pte_t pte) +{ + return pte; +} + +static __always_inline pmd_t pmd_clear_uffd(pmd_t pmd) +{ + return pmd; +} + +static __always_inline pte_t pte_swp_mkuffd(pte_t pte) +{ + return pte; +} + +static __always_inline int pte_swp_uffd(pte_t pte) +{ + return 0; +} + +static __always_inline pte_t pte_swp_clear_uffd(pte_t pte) +{ + return pte; +} + +static inline pmd_t pmd_swp_mkuffd(pmd_t pmd) +{ + return pmd; +} + +static inline int pmd_swp_uffd(pmd_t pmd) +{ + return 0; +} + +static inline pmd_t pmd_swp_clear_uffd(pmd_t pmd) +{ + return pmd; +} +#endif /* CONFIG_HAVE_ARCH_USERFAULTFD_WP */ + +#endif /* _ASM_GENERIC_PGTABLE_UFFD_H */ |
