ppp: fix race conditions in ppp_fill_forward_path
Subsystems (5)
PATCH v2 1/2 ppp: fix race conditions in ppp_fill_forward_path
ppp_fill_forward_path() has two race conditions:
1. The ppp->channels list can change between list_empty() and list_first_entry(), as ppp_lock() is not held. If the only channel is deleted in ppp_disconnect_channel(), list_first_entry() may access an empty head or a freed entry, and trigger a panic.
2. pch->chan can be NULL. When ppp_unregister_channel() is called, pch->chan is set to NULL before pch is removed from ppp->channels.
Fix these by using a lockless RCU approach:
- Use list_first_or_null_rcu() to safely test and access the first list entry.
- Convert list modifications on ppp->channels to their RCU variants and add synchronize_net() after removal.
- Check for a NULL pch->chan before dereferencing it.
---
v2:
Use synchronize_net() instead of synchronize_rcu().
Use READ_ONCE() to access pch->chan, and WRITE_ONCE() to set it to NULL.
drivers/net/ppp/ppp_generic.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-)
drivers/net/ppp/ppp_generic.c +11 -6
@@ -33,6 +33,7 @@#include <linux/ppp_channel.h> #include <linux/ppp-comp.h> #include <linux/skbuff.h> +#include <linux/rculist.h> #include <linux/rtnetlink.h> #include <linux/if_arp.h> #include <linux/ip.h>
@@ -1598,11 +1599,14 @@ static int ppp_fill_forward_path(struct net_device_path_ctx *ctx,if (ppp->flags &SC_MULTILINK )return -EOPNOTSUPP ; -if (list_empty (&ppp->channels)) + pch = list_first_or_null_rcu(&ppp->channels, struct channel, clist); +if (!pch) +return -ENODEV ; + + chan =READ_ONCE (pch->chan); +if (!chan)return -ENODEV ; - pch = list_first_entry(&ppp->channels, struct channel, clist); - chan = pch->chan;if (!chan->ops->fill_forward_path)return -EOPNOTSUPP ;
@@ -2994,7 +2998,7 @@ ppp_unregister_channel(struct ppp_channel *chan)*/ down_write (&pch->chan_sem);spin_lock_bh (&pch->downl); - pch->chan =NULL ; +WRITE_ONCE (pch->chan,NULL );spin_unlock_bh (&pch->downl);up_write (&pch->chan_sem);ppp_disconnect_channel (pch);
@@ -3515,7 +3519,7 @@ ppp_connect_channel(struct channel *pch, int unit) hdrlen = pch->file.hdrlen +2 ;/* for protocol bytes */ if (hdrlen > ppp->dev->hard_header_len) ppp->dev->hard_header_len = hdrlen; -list_add_tail (&pch->clist, &ppp->channels); +list_add_tail_rcu (&pch->clist, &ppp->channels); ++ppp->n_channels; pch->ppp = ppp;refcount_inc (&ppp->file.refcnt);
@@ -3545,10 +3549,11 @@ ppp_disconnect_channel(struct channel *pch)if (ppp) {/* remove it from the ppp unit's list */ ppp_lock (ppp); -list_del (&pch->clist); +list_del_rcu (&pch->clist);if (--ppp->n_channels ==0 )wake_up_interruptible (&ppp->file.rwait);ppp_unlock (ppp); +synchronize_net ();if (refcount_dec_and_test (&ppp->file.refcnt))ppp_destroy_interface (ppp); err =0 ;
Signature · 1 line
2.43.0
PATCH v2 2/2 net: ethernet: mtk_ppe: add RCU lock around dev_fill_forward_path
Ensure ndo_fill_forward_path() is called with RCU lock held.
---
v2: New patch
drivers/net/ethernet/mediatek/mtk_ppe_offload.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/net/ethernet/mediatek/mtk_ppe_offload.c +2 -0
@@ -101,7 +101,9 @@ mtk_flow_get_wdma_info(struct net_device *dev, const u8 *addr, struct mtk_wdma_iif (!IS_ENABLED (CONFIG_NET_MEDIATEK_SOC_WED ))return -1 ; +rcu_read_lock (); err =dev_fill_forward_path (dev, addr, &stack); +rcu_read_unlock ();if (err)return err;
Signature · 1 line
2.43.0
Re: [PATCH net v2 2/2] net: ethernet: mtk_ppe: add RCU lock around dev_fill_forward_path
From: Qingfang Deng <[email protected]>
Date: Wed, 13 Aug 2025 09:48:18 +0800
Quoted 15 lines
Ensure
ndo_fill_forward_path()is called with RCU lock held.Fixes 2830e314778d ("net: ethernet: mtk-ppe: fix traffic offload with bridged wlan")Signed-off-by Qingfang Deng <[email protected]>---
v2: New patchdrivers/net/ethernet/mediatek/mtk_ppe_offload.c | 2 ++ 1 file changed, 2 insertions(+)drivers/net/ethernet/mediatek/mtk_ppe_offload.c +0
-0
drivers/net/ethernet/mediatek/mtk_ppe_offload.c mtk_flow_get_wdma_info(struct net_device *dev, const u8 *addr, struct mtk_wdma_i · line 106
Quoted 6 lines
drivers/net/ethernet/mediatek/mtk_ppe_offload.c +2
-0@@ -101,7 +101,9 @@ mtk_flow_get_wdma_info(struct net_device *dev, const u8 *addr, struct mtk_wdma_iif (!IS_ENABLED (CONFIG_NET_MEDIATEK_SOC_WED ))return -1 ; +rcu_read_lock (); err =dev_fill_forward_path (dev, addr, &stack); +rcu_read_unlock ();
This should be squashed to patch 1 or reorded as patch 1.
Quoted 6 lines
drivers/net/ethernet/mediatek/mtk_ppe_offload.c +0
-0if (err)return err;Signature · 1 line
2.43.0