diff options
| author | Alexei Starovoitov <ast@kernel.org> | 2023-05-06 16:42:58 -0700 |
|---|---|---|
| committer | Alexei Starovoitov <ast@kernel.org> | 2023-05-06 16:43:10 -0700 |
| commit | 6e61c5fa4d43d4c3f780f74ba6b08dba80bd653a (patch) | |
| tree | 9a5ef4b52333e03d5360e85b6d3aa34fa9747050 /tools/testing/selftests/bpf/progs/dynptr_fail.c | |
| parent | e04ddf179c2acb6de841016e5bcf29b26705b4ec (diff) | |
| parent | 798e48fc28fa64aa4eca6e8a404fa20ac8f7c09e (diff) | |
| download | linux-6e61c5fa4d43d4c3f780f74ba6b08dba80bd653a.tar.gz linux-6e61c5fa4d43d4c3f780f74ba6b08dba80bd653a.tar.bz2 linux-6e61c5fa4d43d4c3f780f74ba6b08dba80bd653a.zip | |
Merge branch 'Dynptr Verifier Adjustments'
Daniel Rosenberg says:
====================
These patches relax a few verifier requirements around dynptrs.
Patches 1-3 are unchanged from v2, apart from rebasing
Patch 4 is the same as in v1, see
https://lore.kernel.org/bpf/CA+PiJmST4WUH061KaxJ4kRL=fqy3X6+Wgb2E2rrLT5OYjUzxfQ@mail.gmail.com/
Patch 5 adds a test for the change in Patch 4
====================
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Diffstat (limited to 'tools/testing/selftests/bpf/progs/dynptr_fail.c')
| -rw-r--r-- | tools/testing/selftests/bpf/progs/dynptr_fail.c | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/tools/testing/selftests/bpf/progs/dynptr_fail.c b/tools/testing/selftests/bpf/progs/dynptr_fail.c index efe4ce72d00e..c2f0e18af951 100644 --- a/tools/testing/selftests/bpf/progs/dynptr_fail.c +++ b/tools/testing/selftests/bpf/progs/dynptr_fail.c @@ -1665,3 +1665,23 @@ int clone_xdp_packet_data(struct xdp_md *xdp) return 0; } + +/* Buffers that are provided must be sufficiently long */ +SEC("?cgroup_skb/egress") +__failure __msg("memory, len pair leads to invalid memory access") +int test_dynptr_skb_small_buff(struct __sk_buff *skb) +{ + struct bpf_dynptr ptr; + char buffer[8] = {}; + __u64 *data; + + if (bpf_dynptr_from_skb(skb, 0, &ptr)) { + err = 1; + return 1; + } + + /* This may return NULL. SKB may require a buffer */ + data = bpf_dynptr_slice(&ptr, 0, buffer, 9); + + return !!data; +} |