Skip to content

Commit

Permalink
selftests/bpf: Add tests for ldsx of pkt data/data_end/data_meta acce…
Browse files Browse the repository at this point in the history
…sses

The following tests are added to verifier_ldsx.c:
  - sign extension of data/data_end/data_meta for tcx programs.
    The actual checking is in bpf_skb_is_valid_access() which
    is called by sk_filter, cg_skb, lwt, tc(tcx) and sk_skb.
  - sign extension of data/data_end/data_meta for xdp programs.
  - sign extension of data/data_end for flow_dissector programs.

All newly-added tests have verification failure with message
"invalid bpf_context access". Without previous patch, all these
tests succeeded verification.

Acked-by: Eduard Zingerman <[email protected]>
Signed-off-by: Yonghong Song <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Alexei Starovoitov <[email protected]>
Signed-off-by: Andrii Nakryiko <[email protected]>
  • Loading branch information
Yonghong Song authored and anakryiko committed Jul 29, 2024
1 parent 92de360 commit 63a9936
Showing 1 changed file with 112 additions and 0 deletions.
112 changes: 112 additions & 0 deletions tools/testing/selftests/bpf/progs/verifier_ldsx.c
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,118 @@ __naked void ldsx_s32_range(void)
: __clobber_all);
}

SEC("xdp")
__description("LDSX, xdp s32 xdp_md->data")
__failure __msg("invalid bpf_context access")
__naked void ldsx_ctx_1(void)
{
asm volatile (
"r2 = *(s32 *)(r1 + %[xdp_md_data]);"
"r0 = 0;"
"exit;"
:
: __imm_const(xdp_md_data, offsetof(struct xdp_md, data))
: __clobber_all);
}

SEC("xdp")
__description("LDSX, xdp s32 xdp_md->data_end")
__failure __msg("invalid bpf_context access")
__naked void ldsx_ctx_2(void)
{
asm volatile (
"r2 = *(s32 *)(r1 + %[xdp_md_data_end]);"
"r0 = 0;"
"exit;"
:
: __imm_const(xdp_md_data_end, offsetof(struct xdp_md, data_end))
: __clobber_all);
}

SEC("xdp")
__description("LDSX, xdp s32 xdp_md->data_meta")
__failure __msg("invalid bpf_context access")
__naked void ldsx_ctx_3(void)
{
asm volatile (
"r2 = *(s32 *)(r1 + %[xdp_md_data_meta]);"
"r0 = 0;"
"exit;"
:
: __imm_const(xdp_md_data_meta, offsetof(struct xdp_md, data_meta))
: __clobber_all);
}

SEC("tcx/ingress")
__description("LDSX, tcx s32 __sk_buff->data")
__failure __msg("invalid bpf_context access")
__naked void ldsx_ctx_4(void)
{
asm volatile (
"r2 = *(s32 *)(r1 + %[sk_buff_data]);"
"r0 = 0;"
"exit;"
:
: __imm_const(sk_buff_data, offsetof(struct __sk_buff, data))
: __clobber_all);
}

SEC("tcx/ingress")
__description("LDSX, tcx s32 __sk_buff->data_end")
__failure __msg("invalid bpf_context access")
__naked void ldsx_ctx_5(void)
{
asm volatile (
"r2 = *(s32 *)(r1 + %[sk_buff_data_end]);"
"r0 = 0;"
"exit;"
:
: __imm_const(sk_buff_data_end, offsetof(struct __sk_buff, data_end))
: __clobber_all);
}

SEC("tcx/ingress")
__description("LDSX, tcx s32 __sk_buff->data_meta")
__failure __msg("invalid bpf_context access")
__naked void ldsx_ctx_6(void)
{
asm volatile (
"r2 = *(s32 *)(r1 + %[sk_buff_data_meta]);"
"r0 = 0;"
"exit;"
:
: __imm_const(sk_buff_data_meta, offsetof(struct __sk_buff, data_meta))
: __clobber_all);
}

SEC("flow_dissector")
__description("LDSX, flow_dissector s32 __sk_buff->data")
__failure __msg("invalid bpf_context access")
__naked void ldsx_ctx_7(void)
{
asm volatile (
"r2 = *(s32 *)(r1 + %[sk_buff_data]);"
"r0 = 0;"
"exit;"
:
: __imm_const(sk_buff_data, offsetof(struct __sk_buff, data))
: __clobber_all);
}

SEC("flow_dissector")
__description("LDSX, flow_dissector s32 __sk_buff->data_end")
__failure __msg("invalid bpf_context access")
__naked void ldsx_ctx_8(void)
{
asm volatile (
"r2 = *(s32 *)(r1 + %[sk_buff_data_end]);"
"r0 = 0;"
"exit;"
:
: __imm_const(sk_buff_data_end, offsetof(struct __sk_buff, data_end))
: __clobber_all);
}

#else

SEC("socket")
Expand Down

0 comments on commit 63a9936

Please sign in to comment.