Skip to content

Commit 505ead7

Browse files
leitaokuba-moo
authored andcommitted
netpoll: hold rcu read lock in __netpoll_send_skb()
The function __netpoll_send_skb() is being invoked without holding the RCU read lock. This oversight triggers a warning message when CONFIG_PROVE_RCU_LIST is enabled: net/core/netpoll.c:330 suspicious rcu_dereference_check() usage! netpoll_send_skb netpoll_send_udp write_ext_msg console_flush_all console_unlock vprintk_emit To prevent npinfo from disappearing unexpectedly, ensure that __netpoll_send_skb() is protected with the RCU read lock. Fixes: 2899656 ("netpoll: take rcu_read_lock_bh() in netpoll_send_skb_on_dev()") Signed-off-by: Breno Leitao <leitao@debian.org> Reviewed-by: Simon Horman <horms@kernel.org> Link: https://patch.msgid.link/20250306-netpoll_rcu_v2-v2-1-bc4f5c51742a@debian.org Signed-off-by: Jakub Kicinski <kuba@kernel.org>
1 parent e6360f0 commit 505ead7

File tree

1 file changed

+7
-2
lines changed

1 file changed

+7
-2
lines changed

net/core/netpoll.c

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -319,6 +319,7 @@ static int netpoll_owner_active(struct net_device *dev)
319319
static netdev_tx_t __netpoll_send_skb(struct netpoll *np, struct sk_buff *skb)
320320
{
321321
netdev_tx_t status = NETDEV_TX_BUSY;
322+
netdev_tx_t ret = NET_XMIT_DROP;
322323
struct net_device *dev;
323324
unsigned long tries;
324325
/* It is up to the caller to keep npinfo alive. */
@@ -327,11 +328,12 @@ static netdev_tx_t __netpoll_send_skb(struct netpoll *np, struct sk_buff *skb)
327328
lockdep_assert_irqs_disabled();
328329

329330
dev = np->dev;
331+
rcu_read_lock();
330332
npinfo = rcu_dereference_bh(dev->npinfo);
331333

332334
if (!npinfo || !netif_running(dev) || !netif_device_present(dev)) {
333335
dev_kfree_skb_irq(skb);
334-
return NET_XMIT_DROP;
336+
goto out;
335337
}
336338

337339
/* don't get messages out of order, and no recursion */
@@ -370,7 +372,10 @@ static netdev_tx_t __netpoll_send_skb(struct netpoll *np, struct sk_buff *skb)
370372
skb_queue_tail(&npinfo->txq, skb);
371373
schedule_delayed_work(&npinfo->tx_work,0);
372374
}
373-
return NETDEV_TX_OK;
375+
ret = NETDEV_TX_OK;
376+
out:
377+
rcu_read_unlock();
378+
return ret;
374379
}
375380

376381
netdev_tx_t netpoll_send_skb(struct netpoll *np, struct sk_buff *skb)

0 commit comments

Comments
 (0)