selftests/bpf: fix "bind{4,6} deny specific IP & port" on s390
Subsystems (3)
PATCH 1/1 selftests/bpf: fix "bind{4,6} deny specific IP & port" on s390
"bind4 allow specific IP & port" and "bind6 deny specific IP & port" fail on s390 because of endianness issue: the 4 IP address bytes are loaded as a word and compared with a constant, but the value of this constant should be different on big- and little- endian machines, which is not the case right now.
Use __constant_ntohl to generate proper value based on machine endianness.
--- tools/testing/selftests/bpf/test_sock.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
tools/testing/selftests/bpf/test_sock.c +5 -2
@@ -8,6 +8,7 @@#include <sys/types.h> #include <sys/socket.h> +#include <asm/byteorder.h> #include <linux/filter.h> #include <bpf/bpf.h>
@@ -232,7 +233,8 @@ static struct sock_test tests[] = {/* if (ip == expected && port == expected) */ BPF_LDX_MEM (BPF_W ,BPF_REG_7 ,BPF_REG_6 , offsetof(struct bpf_sock, src_ip6[3])), -BPF_JMP_IMM (BPF_JNE ,BPF_REG_7 ,0x01000000 ,4 ), +BPF_JMP_IMM (BPF_JNE ,BPF_REG_7 , +__constant_ntohl (0x00000001 ),4 ),BPF_LDX_MEM (BPF_W ,BPF_REG_7 ,BPF_REG_6 , offsetof(struct bpf_sock , src_port)), BPF_JMP_IMM(BPF_JNE, BPF_REG_7, 0x2001, 2),
@@ -261,7 +263,8 @@ static struct sock_test tests[] = {/* if (ip == expected && port == expected) */ BPF_LDX_MEM (BPF_W ,BPF_REG_7 ,BPF_REG_6 , offsetof(struct bpf_sock , src_ip4)), -BPF_JMP_IMM (BPF_JNE ,BPF_REG_7 ,0x0100007F ,4 ), +BPF_JMP_IMM (BPF_JNE ,BPF_REG_7 , +__constant_ntohl (0x7F000001 ),4 ),BPF_LDX_MEM (BPF_W ,BPF_REG_7 ,BPF_REG_6 , offsetof(struct bpf_sock , src_port)), BPF_JMP_IMM(BPF_JNE, BPF_REG_7, 0x1002, 2),
Signature · 1 line
2.21.0
Quoted 21 lines · Ilya Leoshkevich
"bind4 allow specific IP & port" and "bind6 deny specific IP & port" fail on s390 because of endianness issue: the 4 IP address bytes are loaded as a word and compared with a constant, but the value of this constant should be different on big- and little- endian machines, which is not the case right now.
Use
__constant_ntohlto generate proper value based on machine endianness.Fixes 1d436885b23b ("selftests/bpf: Selftest for sys_bind post-hooks.")Signed-off-by Ilya Leoshkevich <[email protected]>--- tools/testing/selftests/bpf/test_sock.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)tools/testing/selftests/bpf/test_sock.c +0
-0
tools/testing/selftests/bpf/test_sock.c line 11
Quoted 4 lines
tools/testing/selftests/bpf/test_sock.c +1
-0@@ -8,6 +8,7 @@#include <sys/types.h> #include <sys/socket.h> +#include <asm/byteorder.h>
Maybe use bpf_endian.h and bpf_ntohl instead, sticking to BPF stuff already used by other tests?
Quoted 26 lines
tools/testing/selftests/bpf/test_sock.c +4
-3#include <linux/filter.h> #include <bpf/bpf.h> @@ -232,7 +233,8 @@ static struct sock_test tests[] = {/* if (ip == expected && port == expected) */ BPF_LDX_MEM (BPF_W ,BPF_REG_7 ,BPF_REG_6 , offsetof(struct bpf_sock, src_ip6[3])), -BPF_JMP_IMM (BPF_JNE ,BPF_REG_7 ,0x01000000 ,4 ), +BPF_JMP_IMM (BPF_JNE ,BPF_REG_7 , +__constant_ntohl (0x00000001 ),4 ),BPF_LDX_MEM (BPF_W ,BPF_REG_7 ,BPF_REG_6 , offsetof(struct bpf_sock , src_port)), BPF_JMP_IMM(BPF_JNE, BPF_REG_7, 0x2001, 2),@@ -261,7 +263,8 @@ static struct sock_test tests[] = {/* if (ip == expected && port == expected) */ BPF_LDX_MEM (BPF_W ,BPF_REG_7 ,BPF_REG_6 , offsetof(struct bpf_sock , src_ip4)), -BPF_JMP_IMM (BPF_JNE ,BPF_REG_7 ,0x0100007F ,4 ), +BPF_JMP_IMM (BPF_JNE ,BPF_REG_7 , +__constant_ntohl (0x7F000001 ),4 ),BPF_LDX_MEM (BPF_W ,BPF_REG_7 ,BPF_REG_6 , offsetof(struct bpf_sock , src_port)), BPF_JMP_IMM(BPF_JNE, BPF_REG_7, 0x1002, 2), --2.21.0