Skip to content

Commit 157f291

Browse files
leitaokuba-moo
authored andcommitted
netkit: Assign missing bpf_net_context
During the introduction of struct bpf_net_context handling for XDP-redirect, the netkit driver has been missed, which also requires it because NETKIT_REDIRECT invokes skb_do_redirect() which is accessing the per-CPU variables. Otherwise we see the following crash: BUG: kernel NULL pointer dereference, address: 0000000000000038 bpf_redirect() netkit_xmit() dev_hard_start_xmit() Set the bpf_net_context before invoking netkit_xmit() program within the netkit driver. Fixes: 401cb7d ("net: Reference bpf_redirect_info via task_struct on PREEMPT_RT.") Signed-off-by: Breno Leitao <[email protected]> Acked-by: Daniel Borkmann <[email protected]> Reviewed-by: Sebastian Andrzej Siewior <[email protected]> Reviewed-by: Toke Høiland-Jørgensen <[email protected]> Acked-by: Nikolay Aleksandrov <[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 4144a10 commit 157f291

File tree

1 file changed

+3
-0
lines changed

1 file changed

+3
-0
lines changed

drivers/net/netkit.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,13 +65,15 @@ static struct netkit *netkit_priv(const struct net_device *dev)
6565

6666
static netdev_tx_t netkit_xmit(struct sk_buff *skb, struct net_device *dev)
6767
{
68+
struct bpf_net_context __bpf_net_ctx, *bpf_net_ctx;
6869
struct netkit *nk = netkit_priv(dev);
6970
enum netkit_action ret = READ_ONCE(nk->policy);
7071
netdev_tx_t ret_dev = NET_XMIT_SUCCESS;
7172
const struct bpf_mprog_entry *entry;
7273
struct net_device *peer;
7374
int len = skb->len;
7475

76+
bpf_net_ctx = bpf_net_ctx_set(&__bpf_net_ctx);
7577
rcu_read_lock();
7678
peer = rcu_dereference(nk->peer);
7779
if (unlikely(!peer || !(peer->flags & IFF_UP) ||
@@ -110,6 +112,7 @@ static netdev_tx_t netkit_xmit(struct sk_buff *skb, struct net_device *dev)
110112
break;
111113
}
112114
rcu_read_unlock();
115+
bpf_net_ctx_clear(bpf_net_ctx);
113116
return ret_dev;
114117
}
115118

0 commit comments

Comments
 (0)