]> git.ipfire.org Git - thirdparty/kernel/stable.git/commit
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)
committerSasha Levin <sashal@kernel.org>
Tue, 26 Mar 2024 22:19:26 +0000 (18:19 -0400)
commitfa5bef5e80c6a3321b2b1a7070436f3bc5daf07c
tree6debc75d81dc6a1ac603d380073ec0936bac8cb7
parentda10f6b7918abd5b4bc5c9cb66f0fc6763ac48f3
libbpf: Use OPTS_SET() macro in bpf_xdp_query()

[ Upstream commit 92a871ab9fa59a74d013bc04f321026a057618e7 ]

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
Signed-off-by: Sasha Levin <sashal@kernel.org>
tools/lib/bpf/netlink.c