libbpf: Use OPTS_SET() macro in bpf_xdp_query()
authorToke Høiland-Jørgensen <toke@redhat.com>
Tue, 6 Feb 2024 12:59:22 +0000 (13:59 +0100)
committerAndrii Nakryiko <andrii@kernel.org>
Tue, 6 Feb 2024 17:51:26 +0000 (09:51 -0800)
commit92a871ab9fa59a74d013bc04f321026a057618e7
tree8e13b5d7d65df829f352e669512badd7f97fb2b5
parentc27aa462aa78ff157fdda222af242e4571803d4a
libbpf: Use OPTS_SET() macro in bpf_xdp_query()

When the feature_flags and xdp_zc_max_segs fields were added to the libbpf
bpf_xdp_query_opts, the code writing them did not use the OPTS_SET() macro.
This causes libbpf to write to those fields unconditionally, which means
that programs compiled against an older version of libbpf (with a smaller
size of the bpf_xdp_query_opts struct) will have its stack corrupted by
libbpf writing out of bounds.

The patch adding the feature_flags field has an early bail out if the
feature_flags field is not part of the opts struct (via the OPTS_HAS)
macro, but the patch adding xdp_zc_max_segs does not. For consistency, this
fix just changes the assignments to both fields to use the OPTS_SET()
macro.

Fixes: 13ce2daa259a ("xsk: add new netlink attribute dedicated for ZC max frags")
Signed-off-by: Toke Høiland-Jørgensen <toke@redhat.com>
Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
Link: https://lore.kernel.org/bpf/20240206125922.1992815-1-toke@redhat.com
tools/lib/bpf/netlink.c