Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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

authored by

Toke Høiland-Jørgensen and committed by
Andrii Nakryiko
92a871ab c27aa462

+2 -2
+2 -2
tools/lib/bpf/netlink.c
··· 496 496 if (err) 497 497 return libbpf_err(err); 498 498 499 - opts->feature_flags = md.flags; 500 - opts->xdp_zc_max_segs = md.xdp_zc_max_segs; 499 + OPTS_SET(opts, feature_flags, md.flags); 500 + OPTS_SET(opts, xdp_zc_max_segs, md.xdp_zc_max_segs); 501 501 502 502 skip_feature_flags: 503 503 return 0;