]> Git Repo - linux.git/commit
bpf: Make dst_port field in struct bpf_sock 16-bit wide
authorJakub Sitnicki <[email protected]>
Sun, 30 Jan 2022 11:55:17 +0000 (12:55 +0100)
committerAlexei Starovoitov <[email protected]>
Mon, 31 Jan 2022 20:39:12 +0000 (12:39 -0800)
commit4421a582718ab81608d8486734c18083b822390d
tree43a66705d288c67e0c490b8622dad7704f86ab43
parentb3dddab2ff10853aa3ef70483415d07fee3034ba
bpf: Make dst_port field in struct bpf_sock 16-bit wide

Menglong Dong reports that the documentation for the dst_port field in
struct bpf_sock is inaccurate and confusing. From the BPF program PoV, the
field is a zero-padded 16-bit integer in network byte order. The value
appears to the BPF user as if laid out in memory as so:

  offsetof(struct bpf_sock, dst_port) + 0  <port MSB>
                                      + 8  <port LSB>
                                      +16  0x00
                                      +24  0x00

32-, 16-, and 8-bit wide loads from the field are all allowed, but only if
the offset into the field is 0.

32-bit wide loads from dst_port are especially confusing. The loaded value,
after converting to host byte order with bpf_ntohl(dst_port), contains the
port number in the upper 16-bits.

Remove the confusion by splitting the field into two 16-bit fields. For
backward compatibility, allow 32-bit wide loads from offsetof(struct
bpf_sock, dst_port).

While at it, allow loads 8-bit loads at offset [0] and [1] from dst_port.

Reported-by: Menglong Dong <[email protected]>
Signed-off-by: Jakub Sitnicki <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Alexei Starovoitov <[email protected]>
include/uapi/linux/bpf.h
net/core/filter.c
This page took 0.060666 seconds and 4 git commands to generate.