bpf: allow wide (u64) aligned stores for some fields of bpf_sock_addr
Subsystems (7)
v2 cover bpf: allow wide (u64) aligned stores for some fields of bpf_sock_addr
Clang can generate 8-byte stores for user_ip6 & msg_src_ip6, let's support that on the verifier side.
v2:
* Add simple cover letter (Yonghong Song)
* Update comments (Yonghong Song)
* Remove [4] selftests (Yonghong Song)
Stanislav Fomichev (3):
bpf: allow wide (u64) aligned stores for some fields of bpf_sock_addr
bpf: sync bpf.h to tools/
selftests/bpf: add verifier tests for wide stores
include/linux/filter.h | 6 ++++ include/uapi/linux/bpf.h | 4 +-- net/core/filter.c | 22 +++++++----- tools/include/uapi/linux/bpf.h | 4 +-- tools/testing/selftests/bpf/test_verifier.c | 17 +++++++-- .../selftests/bpf/verifier/wide_store.c | 36 +++++++++++++++++++ 6 files changed, 74 insertions(+), 15 deletions(-) create mode 100644 tools/testing/selftests/bpf/verifier/wide_store.c
Signature · 1 line
2.22.0.410.gd8fdbe21b5-goog
PATCH v2 1/3 bpf: allow wide (u64) aligned stores for some fields of bpf_sock_addr
Since commit cd17d7770578 ("bpf/tools: sync bpf.h") clang decided that it can do a single u64 store into user_ip6[2] instead of two separate u32 ones:
# 17: (18) r2 = 0x100000000000000 # ; ctx->user_ip6[2] = bpf_htonl(DST_REWRITE_IP6_2); # 19: (7b) *(u64 *)(r1 +16) = r2 # invalid bpf_context access off=16 size=8
From the compiler point of view it does look like a correct thing to do, so let's support it on the kernel side.
Credit to Andrii Nakryiko for a proper implementation of bpf_ctx_wide_store_ok.
--- include/linux/filter.h | 6 ++++++ include/uapi/linux/bpf.h | 4 ++-- net/core/filter.c | 22 ++++++++++++++-------- 3 files changed, 22 insertions(+), 10 deletions(-)
include/linux/filter.h +6 -0
@@ -746,6 +746,12 @@ bpf_ctx_narrow_access_ok(u32 off, u32 size, u32 size_default)return size <= size_default && (size & (size -1 )) ==0 ; } +#define bpf_ctx_wide_store_ok (off, size, type, field) \ + (size == sizeof(__u64) && \ + off >= offsetof(type, field) && \ + off + sizeof(__u64) <= offsetofend(type, field) && \ + off % sizeof(__u64) == 0) +#define bpf_classic_proglen (fprog) (fprog->len * sizeof(fprog->filter[0]))static inline void bpf_prog_lock_ro (struct bpf_prog *fp)
include/uapi/linux/bpf.h +2 -2
@@ -3237,7 +3237,7 @@ struct bpf_sock_addr {__u32 user_ip4;/* Allows 1,2,4-byte read and 4-byte write. * Stored in network byte order. */ -__u32 user_ip6[4 ];/* Allows 1,2,4-byte read an 4-byte write. +__u32 user_ip6[4 ];/* Allows 1,2,4-byte read an 4,8-byte write. * Stored in network byte order. */ __u32 user_port;/* Allows 4-byte read and write.
@@ -3249,7 +3249,7 @@ struct bpf_sock_addr {__u32 msg_src_ip4;/* Allows 1,2,4-byte read an 4-byte write. * Stored in network byte order. */ -__u32 msg_src_ip6[4 ];/* Allows 1,2,4-byte read an 4-byte write. +__u32 msg_src_ip6[4 ];/* Allows 1,2,4-byte read an 4,8-byte write. * Stored in network byte order. */ __bpf_md_ptr(struct bpf_sock *, sk);
net/core/filter.c +14 -8
@@ -6849,6 +6849,16 @@ static bool sock_addr_is_valid_access(int off, int size,if (!bpf_ctx_narrow_access_ok (off, size, size_default))return false; }else { +if (bpf_ctx_wide_store_ok (off, size, + struct bpf_sock_addr, + user_ip6)) +return true; + +if (bpf_ctx_wide_store_ok (off, size, + struct bpf_sock_addr, + msg_src_ip6)) +return true; +if (size != size_default)return false; }
@@ -7689,9 +7699,6 @@ static u32 xdp_convert_ctx_access(enum bpf_access_type type,/* SOCK_ADDR_STORE_NESTED_FIELD_OFF() has semantic similar to * SOCK_ADDR_LOAD_NESTED_FIELD_SIZE_OFF() but for store operation. * -* It doesn't support SIZE argument though since narrow stores are not -* supported for now. -* * In addition it uses Temporary Field TF (member of struct S) as the 3rd * "register" since two registers available in convert_ctx_access are not * enough: we can't override neither SRC, since it contains value to store, nor
@@ -7699,7 +7706,7 @@ static u32 xdp_convert_ctx_access(enum bpf_access_type type,* instructions. But we need a temporary place to save pointer to nested * structure whose field we want to store to. */ -#define SOCK_ADDR_STORE_NESTED_FIELD_OFF (S ,NS ,F ,NF ,OFF ,TF ) \ +#define SOCK_ADDR_STORE_NESTED_FIELD_OFF (S ,NS ,F ,NF ,SIZE ,OFF ,TF ) \ do { \ int tmp_reg = BPF_REG_9; \ if (si->src_reg == tmp_reg || si->dst_reg == tmp_reg) \
@@ -7710,8 +7717,7 @@ static u32 xdp_convert_ctx_access(enum bpf_access_type type, offsetof(S, TF)); \ *insn++ =BPF_LDX_MEM (BPF_FIELD_SIZEOF (S ,F ), tmp_reg, \ si->dst_reg, offsetof(S , F)); \ - *insn++ =BPF_STX_MEM ( \ -BPF_FIELD_SIZEOF (NS ,NF ), tmp_reg, si->src_reg, \ + *insn++ =BPF_STX_MEM (SIZE , tmp_reg, si->src_reg, \bpf_target_off (NS ,NF ,FIELD_SIZEOF (NS ,NF ), \ target_size) \ +OFF ); \
@@ -7723,8 +7729,8 @@ static u32 xdp_convert_ctx_access(enum bpf_access_type type, TF) \ do { \ if (type == BPF_WRITE) { \ - SOCK_ADDR_STORE_NESTED_FIELD_OFF(S, NS, F, NF, OFF, \ - TF); \ + SOCK_ADDR_STORE_NESTED_FIELD_OFF(S, NS, F, NF, SIZE, \ + OFF, TF); \ } else { \ SOCK_ADDR_LOAD_NESTED_FIELD_SIZE_OFF( \ S, NS, F, NF, SIZE, OFF); \
Signature · 1 line
2.22.0.410.gd8fdbe21b5-goog
Quoted 51 lines · Stanislav Fomichev
Since commit
cd17d7770578("bpf/tools: syncbpf.h") clang decided that it can do a single u64 store into user_ip6[2] instead of two separate u32 ones:# 17: (18) r2 = 0x100000000000000 # ; ctx->user_ip6[2] = bpf_htonl(DST_REWRITE_IP6_2); # 19: (7b) *(u64 *)(r1 +16) = r2 # invalid bpf_context access off=16 size=8From the compiler point of view it does look like a correct thing to do, so let's support it on the kernel side.
Credit to Andrii Nakryiko for a proper implementation of
bpf_ctx_wide_store_ok.Cc Andrii Nakryiko <[email protected]>Cc Yonghong Song <[email protected]>Fixes cd17d7770578 ("bpf/tools: sync bpf.h")Reported-by kernel test robot <[email protected]>Acked-by Yonghong Song <[email protected]>Acked-by Andrii Nakryiko <[email protected]>Signed-off-by Stanislav Fomichev <[email protected]>--- include/linux/filter.h | 6 ++++++ include/uapi/linux/bpf.h | 4 ++-- net/core/filter.c | 22 ++++++++++++++-------- 3 files changed, 22 insertions(+), 10 deletions(-)include/linux/filter.h +6
-0@@ -746,6 +746,12 @@ bpf_ctx_narrow_access_ok(u32 off, u32 size, u32 size_default)return size <= size_default && (size & (size -1 )) ==0 ; } +#define bpf_ctx_wide_store_ok (off, size, type, field) \ + (size == sizeof(__u64) && \ + off >= offsetof(type, field) && \ + off + sizeof(__u64) <= offsetofend(type, field) && \ + off % sizeof(__u64) == 0) +#define bpf_classic_proglen (fprog) (fprog->len * sizeof(fprog->filter[0]))static inline void bpf_prog_lock_ro (struct bpf_prog *fp)include/uapi/linux/bpf.h +0
-0
include/uapi/linux/bpf.h struct bpf_sock_addr { · line 3240
Quoted 5 lines
include/uapi/linux/bpf.h +1
-1@@ -3237,7 +3237,7 @@ struct bpf_sock_addr {__u32 user_ip4;/* Allows 1,2,4-byte read and 4-byte write. * Stored in network byte order. */ -__u32 user_ip6[4 ];/* Allows 1,2,4-byte read an 4-byte write. +__u32 user_ip6[4 ];/* Allows 1,2,4-byte read an 4,8-byte write.
typo: an -> and
include/uapi/linux/bpf.h struct bpf_sock_addr { · line 3249
Quoted 5 lines
include/uapi/linux/bpf.h +0
-0* Stored in network byte order. */ __u32 user_port;/* Allows 4-byte read and write. @@ -3249,7 +3249,7 @@ struct bpf_sock_addr {__u32 msg_src_ip4;/* Allows 1,2,4-byte read an 4-byte write.
same
include/uapi/linux/bpf.h struct bpf_sock_addr { · line 3252
Quoted 4 lines
include/uapi/linux/bpf.h +1
-1* Stored in network byte order. */ -__u32 msg_src_ip6[4 ];/* Allows 1,2,4-byte read an 4-byte write. +__u32 msg_src_ip6[4 ];/* Allows 1,2,4-byte read an 4,8-byte write.
the power of copy/paste! :)
Quoted 67 lines
include/uapi/linux/bpf.h +0
-0* Stored in network byte order. */ __bpf_md_ptr(struct bpf_sock *, sk);net/core/filter.c +14
-9@@ -6849,6 +6849,16 @@ static bool sock_addr_is_valid_access(int off, int size,if (!bpf_ctx_narrow_access_ok (off, size, size_default))return false; }else { +if (bpf_ctx_wide_store_ok (off, size, + struct bpf_sock_addr, + user_ip6)) +return true; + +if (bpf_ctx_wide_store_ok (off, size, + struct bpf_sock_addr, + msg_src_ip6)) +return true; +if (size != size_default)return false; }@@ -7689,9 +7699,6 @@ static u32 xdp_convert_ctx_access(enum bpf_access_type type,/* SOCK_ADDR_STORE_NESTED_FIELD_OFF() has semantic similar to * SOCK_ADDR_LOAD_NESTED_FIELD_SIZE_OFF() but for store operation. * -* It doesn't support SIZE argument though since narrow stores are not -* supported for now. -* * In addition it uses Temporary Field TF (member of struct S) as the 3rd * "register" since two registers available in convert_ctx_access are not * enough: we can't override neither SRC, since it contains value to store, nor @@ -7699,7 +7706,7 @@ static u32 xdp_convert_ctx_access(enum bpf_access_type type,* instructions. But we need a temporary place to save pointer to nested * structure whose field we want to store to. */ -#define SOCK_ADDR_STORE_NESTED_FIELD_OFF (S ,NS ,F ,NF ,OFF ,TF ) \ +#define SOCK_ADDR_STORE_NESTED_FIELD_OFF (S ,NS ,F ,NF ,SIZE ,OFF ,TF ) \ do { \ int tmp_reg = BPF_REG_9; \ if (si->src_reg == tmp_reg || si->dst_reg == tmp_reg) \@@ -7710,8 +7717,7 @@ static u32 xdp_convert_ctx_access(enum bpf_access_type type, offsetof(S, TF)); \ *insn++ =BPF_LDX_MEM (BPF_FIELD_SIZEOF (S ,F ), tmp_reg, \ si->dst_reg, offsetof(S , F)); \ - *insn++ =BPF_STX_MEM ( \ -BPF_FIELD_SIZEOF (NS ,NF ), tmp_reg, si->src_reg, \ + *insn++ =BPF_STX_MEM (SIZE , tmp_reg, si->src_reg, \bpf_target_off (NS ,NF ,FIELD_SIZEOF (NS ,NF ), \ target_size) \ +OFF ); \@@ -7723,8 +7729,8 @@ static u32 xdp_convert_ctx_access(enum bpf_access_type type, TF) \ do { \ if (type == BPF_WRITE) { \ - SOCK_ADDR_STORE_NESTED_FIELD_OFF(S, NS, F, NF, OFF, \ - TF); \ + SOCK_ADDR_STORE_NESTED_FIELD_OFF(S, NS, F, NF, SIZE, \ + OFF, TF); \ } else { \ SOCK_ADDR_LOAD_NESTED_FIELD_SIZE_OFF( \ S, NS, F, NF, SIZE, OFF); \ --2.22.0.410.gd8fdbe21b5-goog
Stanislav Fomichev
reviewerQuoted 46 lines · Andrii Nakryiko
Quoted 45 lines · Stanislav Fomichev
Since commit
cd17d7770578("bpf/tools: syncbpf.h") clang decided that it can do a single u64 store into user_ip6[2] instead of two separate u32 ones:# 17: (18) r2 = 0x100000000000000 # ; ctx->user_ip6[2] = bpf_htonl(DST_REWRITE_IP6_2); # 19: (7b) *(u64 *)(r1 +16) = r2 # invalid bpf_context access off=16 size=8From the compiler point of view it does look like a correct thing to do, so let's support it on the kernel side.
Credit to Andrii Nakryiko for a proper implementation of
bpf_ctx_wide_store_ok.Cc Andrii Nakryiko <[email protected]>Cc Yonghong Song <[email protected]>Fixes cd17d7770578 ("bpf/tools: sync bpf.h")Reported-by kernel test robot <[email protected]>Acked-by Yonghong Song <[email protected]>Acked-by Andrii Nakryiko <[email protected]>Signed-off-by Stanislav Fomichev <[email protected]>--- include/linux/filter.h | 6 ++++++ include/uapi/linux/bpf.h | 4 ++-- net/core/filter.c | 22 ++++++++++++++-------- 3 files changed, 22 insertions(+), 10 deletions(-)include/linux/filter.h +6
-0@@ -746,6 +746,12 @@ bpf_ctx_narrow_access_ok(u32 off, u32 size, u32 size_default)return size <= size_default && (size & (size -1 )) ==0 ; } +#define bpf_ctx_wide_store_ok (off, size, type, field) \ + (size == sizeof(__u64) && \ + off >= offsetof(type, field) && \ + off + sizeof(__u64) <= offsetofend(type, field) && \ + off % sizeof(__u64) == 0) +#define bpf_classic_proglen (fprog) (fprog->len * sizeof(fprog->filter[0]))
Quoted 13 lines
include/uapi/linux/bpf.h struct bpf_sock_addr { · line 3240
Quoted 11 lines
include/linux/filter.h +0
-0static inline void bpf_prog_lock_ro (struct bpf_prog *fp)include/uapi/linux/bpf.h +1
-1@@ -3237,7 +3237,7 @@ struct bpf_sock_addr {__u32 user_ip4;/* Allows 1,2,4-byte read and 4-byte write. * Stored in network byte order. */ -__u32 user_ip6[4 ];/* Allows 1,2,4-byte read an 4-byte write. +__u32 user_ip6[4 ];/* Allows 1,2,4-byte read an 4,8-byte write. typo: an -> and
Oh, I was thinking that it was an article :-/
Will send a v3 with a fix, thanks!
Quoted 82 lines
include/uapi/linux/bpf.h struct bpf_sock_addr { · line 3249
Quoted 5 lines
include/uapi/linux/bpf.h +0
-0* Stored in network byte order. */ __u32 user_port;/* Allows 4-byte read and write. @@ -3249,7 +3249,7 @@ struct bpf_sock_addr {__u32 msg_src_ip4;/* Allows 1,2,4-byte read an 4-byte write. same
include/uapi/linux/bpf.h struct bpf_sock_addr { · line 3252
Quoted 4 lines
include/uapi/linux/bpf.h +1
-1* Stored in network byte order. */ -__u32 msg_src_ip6[4 ];/* Allows 1,2,4-byte read an 4-byte write. +__u32 msg_src_ip6[4 ];/* Allows 1,2,4-byte read an 4,8-byte write. the power of copy/paste! :)
Quoted 67 lines
include/uapi/linux/bpf.h +0
-0* Stored in network byte order. */ __bpf_md_ptr(struct bpf_sock *, sk);net/core/filter.c +14
-9@@ -6849,6 +6849,16 @@ static bool sock_addr_is_valid_access(int off, int size,if (!bpf_ctx_narrow_access_ok (off, size, size_default))return false; }else { +if (bpf_ctx_wide_store_ok (off, size, + struct bpf_sock_addr, + user_ip6)) +return true; + +if (bpf_ctx_wide_store_ok (off, size, + struct bpf_sock_addr, + msg_src_ip6)) +return true; +if (size != size_default)return false; }@@ -7689,9 +7699,6 @@ static u32 xdp_convert_ctx_access(enum bpf_access_type type,/* SOCK_ADDR_STORE_NESTED_FIELD_OFF() has semantic similar to * SOCK_ADDR_LOAD_NESTED_FIELD_SIZE_OFF() but for store operation. * -* It doesn't support SIZE argument though since narrow stores are not -* supported for now. -* * In addition it uses Temporary Field TF (member of struct S) as the 3rd * "register" since two registers available in convert_ctx_access are not * enough: we can't override neither SRC, since it contains value to store, nor @@ -7699,7 +7706,7 @@ static u32 xdp_convert_ctx_access(enum bpf_access_type type,* instructions. But we need a temporary place to save pointer to nested * structure whose field we want to store to. */ -#define SOCK_ADDR_STORE_NESTED_FIELD_OFF (S ,NS ,F ,NF ,OFF ,TF ) \ +#define SOCK_ADDR_STORE_NESTED_FIELD_OFF (S ,NS ,F ,NF ,SIZE ,OFF ,TF ) \ do { \ int tmp_reg = BPF_REG_9; \ if (si->src_reg == tmp_reg || si->dst_reg == tmp_reg) \@@ -7710,8 +7717,7 @@ static u32 xdp_convert_ctx_access(enum bpf_access_type type, offsetof(S, TF)); \ *insn++ =BPF_LDX_MEM (BPF_FIELD_SIZEOF (S ,F ), tmp_reg, \ si->dst_reg, offsetof(S , F)); \ - *insn++ =BPF_STX_MEM ( \ -BPF_FIELD_SIZEOF (NS ,NF ), tmp_reg, si->src_reg, \ + *insn++ =BPF_STX_MEM (SIZE , tmp_reg, si->src_reg, \bpf_target_off (NS ,NF ,FIELD_SIZEOF (NS ,NF ), \ target_size) \ +OFF ); \@@ -7723,8 +7729,8 @@ static u32 xdp_convert_ctx_access(enum bpf_access_type type, TF) \ do { \ if (type == BPF_WRITE) { \ - SOCK_ADDR_STORE_NESTED_FIELD_OFF(S, NS, F, NF, OFF, \ - TF); \ + SOCK_ADDR_STORE_NESTED_FIELD_OFF(S, NS, F, NF, SIZE, \ + OFF, TF); \ } else { \ SOCK_ADDR_LOAD_NESTED_FIELD_SIZE_OFF( \ S, NS, F, NF, SIZE, OFF); \ --2.22.0.410.gd8fdbe21b5-goog
PATCH v2 2/3 bpf: sync bpf.h to tools/
In reply to Stanislav FomichevSync user_ip6 & msg_src_ip6 comments.
--- tools/include/uapi/linux/bpf.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
tools/include/uapi/linux/bpf.h +2 -2
@@ -3237,7 +3237,7 @@ struct bpf_sock_addr {__u32 user_ip4;/* Allows 1,2,4-byte read and 4-byte write. * Stored in network byte order. */ -__u32 user_ip6[4 ];/* Allows 1,2,4-byte read an 4-byte write. +__u32 user_ip6[4 ];/* Allows 1,2,4-byte read an 4,8-byte write. * Stored in network byte order. */ __u32 user_port;/* Allows 4-byte read and write.
@@ -3249,7 +3249,7 @@ struct bpf_sock_addr {__u32 msg_src_ip4;/* Allows 1,2,4-byte read an 4-byte write. * Stored in network byte order. */ -__u32 msg_src_ip6[4 ];/* Allows 1,2,4-byte read an 4-byte write. +__u32 msg_src_ip6[4 ];/* Allows 1,2,4-byte read an 4,8-byte write. * Stored in network byte order. */ __bpf_md_ptr(struct bpf_sock *, sk);
Signature · 1 line
2.22.0.410.gd8fdbe21b5-goog
PATCH v2 3/3 selftests/bpf: add verifier tests for wide stores
In reply to Stanislav FomichevMake sure that wide stores are allowed at proper (aligned) addresses. Note that user_ip6 is naturally aligned on 8-byte boundary, so correct addresses are user_ip6[0] and user_ip6[2]. msg_src_ip6 is, however, aligned on a 4-byte bondary, so only msg_src_ip6[1] can be wide-stored.
--- tools/testing/selftests/bpf/test_verifier.c | 17 +++++++-- .../selftests/bpf/verifier/wide_store.c | 36 +++++++++++++++++++ 2 files changed, 50 insertions(+), 3 deletions(-) create mode 100644 tools/testing/selftests/bpf/verifier/wide_store.c
tools/testing/selftests/bpf/test_verifier.c +14 -3
@@ -105,6 +105,7 @@ struct bpf_test {__u64 data64[TEST_DATA_LEN /8 ]; }; } retvals[MAX_TEST_RUNS ]; +enum bpf_attach_type expected_attach_type; };/* Note we want this to be 64 bit aligned so that the end of our array is
@@ -850,6 +851,7 @@ static void do_test_single(struct bpf_test *test, bool unpriv,int fd_prog, expected_ret, alignment_prevented_execution;int prog_len, prog_type = test->prog_type;struct bpf_insn *prog = test->insns; +struct bpf_load_program_attr attr;int run_errs, run_successes;int map_fds[MAX_NR_MAPS ];const char *expected_err;
@@ -881,8 +883,17 @@ static void do_test_single(struct bpf_test *test, bool unpriv, pflags |=BPF_F_STRICT_ALIGNMENT ;if (test->flags &F_NEEDS_EFFICIENT_UNALIGNED_ACCESS ) pflags |=BPF_F_ANY_ALIGNMENT ; - fd_prog =bpf_verify_program (prog_type, prog, prog_len, pflags, -"GPL" ,0 , bpf_vlog,sizeof (bpf_vlog),4 ); + +memset (&attr,0 ,sizeof (attr)); + attr.prog_type = prog_type; + attr.expected_attach_type = test->expected_attach_type; + attr.insns = prog; + attr.insns_cnt = prog_len; + attr.license ="GPL" ; + attr.log_level =4 ; + attr.prog_flags = pflags; + + fd_prog =bpf_load_program_xattr (&attr, bpf_vlog,sizeof (bpf_vlog));if (fd_prog <0 && !bpf_probe_prog_type (prog_type,0 )) {printf ("SKIP (unsupported program type %d)\n" , prog_type); skips++;
@@ -912,7 +923,7 @@ static void do_test_single(struct bpf_test *test, bool unpriv,printf ("FAIL\nUnexpected success to load!\n" ); goto fail_log; } -if (!strstr (bpf_vlog, expected_err)) { +if (!expected_err || !strstr (bpf_vlog, expected_err)) {printf ("FAIL\nUnexpected error message!\n\tEXP: %s\n\tRES: %s\n" , expected_err, bpf_vlog); goto fail_log;
tools/testing/selftests/bpf/verifier/wide_store.c new file +36 -0
@@ -0,0 +1,36 @@ +#define BPF_SOCK_ADDR (field, off, res, err) \ +{ \ + "wide store to bpf_sock_addr." #field "[" #off "]", \ + .insns = { \ + BPF_MOV64_IMM(BPF_REG_0, 1), \ + BPF_STX_MEM(BPF_DW, BPF_REG_1, BPF_REG_0, \ + offsetof(struct bpf_sock_addr, field[off])), \ + BPF_EXIT_INSN(), \ + }, \ + .result = res, \ + .prog_type = BPF_PROG_TYPE_CGROUP_SOCK_ADDR, \ + .expected_attach_type = BPF_CGROUP_UDP6_SENDMSG, \ + .errstr = err, \ +} + +/* user_ip6[0] is u64 aligned */ +BPF_SOCK_ADDR (user_ip6,0 ,ACCEPT , +NULL ), +BPF_SOCK_ADDR (user_ip6,1 ,REJECT , +"invalid bpf_context access off=12 size=8" ), +BPF_SOCK_ADDR (user_ip6,2 ,ACCEPT , +NULL ), +BPF_SOCK_ADDR (user_ip6,3 ,REJECT , +"invalid bpf_context access off=20 size=8" ), + +/* msg_src_ip6[0] is _not_ u64 aligned */ +BPF_SOCK_ADDR (msg_src_ip6,0 ,REJECT , +"invalid bpf_context access off=44 size=8" ), +BPF_SOCK_ADDR (msg_src_ip6,1 ,ACCEPT , +NULL ), +BPF_SOCK_ADDR (msg_src_ip6,2 ,REJECT , +"invalid bpf_context access off=52 size=8" ), +BPF_SOCK_ADDR (msg_src_ip6,3 ,REJECT , +"invalid bpf_context access off=56 size=8" ), + +#undef BPF_SOCK_ADDR
Signature · 1 line
2.22.0.410.gd8fdbe21b5-goog
Re: [PATCH bpf-next v2 3/3] selftests/bpf: add verifier tests for wide stores
Quoted 11 lines · Stanislav Fomichev
Make sure that wide stores are allowed at proper (aligned) addresses. Note that
user_ip6is naturally aligned on 8-byte boundary, so correct addresses are user_ip6[0] and user_ip6[2].msg_src_ip6is, however, aligned on a 4-byte bondary, so only msg_src_ip6[1] can be wide-stored.Cc Andrii Nakryiko <[email protected]>Cc Yonghong Song <[email protected]>Signed-off-by Stanislav Fomichev <[email protected]>---
Quoted 5 lines
tools/testing/selftests/bpf/test_verifier.c | 17 +++++++-- .../selftests/bpf/verifier/wide_store.c | 36 +++++++++++++++++++ 2 files changed, 50 insertions(+), 3 deletions(-) create mode 100644 tools/testing/selftests/bpf/verifier/wide_store.c
<snip>