Skip to content

Commit 3595599

Browse files
tohojokuba-moo
authored andcommitted
net: xdp: Disallow attaching device-bound programs in generic mode
Device-bound programs are used to support RX metadata kfuncs. These kfuncs are driver-specific and rely on the driver context to read the metadata. This means they can't work in generic XDP mode. However, there is no check to disallow such programs from being attached in generic mode, in which case the metadata kfuncs will be called in an invalid context, leading to crashes. Fix this by adding a check to disallow attaching device-bound programs in generic mode. Fixes: 2b3486b ("bpf: Introduce device-bound XDP programs") Reported-by: Marcus Wichelmann <[email protected]> Closes: https://lore.kernel.org/r/[email protected] Tested-by: Marcus Wichelmann <[email protected]> Acked-by: Stanislav Fomichev <[email protected]> Signed-off-by: Toke Høiland-Jørgensen <[email protected]> Acked-by: Daniel Borkmann <[email protected]> Acked-by: Martin KaFai Lau <[email protected]> Link: https://patch.msgid.link/[email protected] Signed-off-by: Jakub Kicinski <[email protected]>
1 parent 8c670bd commit 3595599

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

net/core/dev.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9924,6 +9924,10 @@ static int dev_xdp_attach(struct net_device *dev, struct netlink_ext_ack *extack
99249924
NL_SET_ERR_MSG(extack, "Program bound to different device");
99259925
return -EINVAL;
99269926
}
9927+
if (bpf_prog_is_dev_bound(new_prog->aux) && mode == XDP_MODE_SKB) {
9928+
NL_SET_ERR_MSG(extack, "Can't attach device-bound programs in generic mode");
9929+
return -EINVAL;
9930+
}
99279931
if (new_prog->expected_attach_type == BPF_XDP_DEVMAP) {
99289932
NL_SET_ERR_MSG(extack, "BPF_XDP_DEVMAP programs can not be attached to a device");
99299933
return -EINVAL;

0 commit comments

Comments
 (0)