diff options
| author | Mina Almasry <almasrymina@google.com> | 2025-03-06 21:55:20 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2025-03-22 12:56:55 -0700 |
| commit | 1c17c8ced25c5fbe424c7ad7ea11d33014a986b1 (patch) | |
| tree | 4b1561ae50097447d2347867217845610f82135d /net | |
| parent | 6effce06cafad6f59a9157db5b79a1d250d9b88f (diff) | |
| download | linux-1c17c8ced25c5fbe424c7ad7ea11d33014a986b1.tar.gz linux-1c17c8ced25c5fbe424c7ad7ea11d33014a986b1.tar.bz2 linux-1c17c8ced25c5fbe424c7ad7ea11d33014a986b1.zip | |
netmem: prevent TX of unreadable skbs
commit f3600c867c99a2cc8038680ecf211089c50e7971 upstream.
Currently on stable trees we have support for netmem/devmem RX but not
TX. It is not safe to forward/redirect an RX unreadable netmem packet
into the device's TX path, as the device may call dma-mapping APIs on
dma addrs that should not be passed to it.
Fix this by preventing the xmit of unreadable skbs.
Tested by configuring tc redirect:
sudo tc qdisc add dev eth1 ingress
sudo tc filter add dev eth1 ingress protocol ip prio 1 flower ip_proto \
tcp src_ip 192.168.1.12 action mirred egress redirect dev eth1
Before, I see unreadable skbs in the driver's TX path passed to dma
mapping APIs.
After, I don't see unreadable skbs in the driver's TX path passed to dma
mapping APIs.
Fixes: 65249feb6b3d ("net: add support for skbs with unreadable frags")
Suggested-by: Jakub Kicinski <kuba@kernel.org>
Cc: stable@vger.kernel.org
Signed-off-by: Mina Almasry <almasrymina@google.com>
Link: https://patch.msgid.link/20250306215520.1415465-1-almasrymina@google.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net')
| -rw-r--r-- | net/core/dev.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/net/core/dev.c b/net/core/dev.c index 7f755270ff1c..b180d175c37f 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -3725,6 +3725,9 @@ static struct sk_buff *validate_xmit_skb(struct sk_buff *skb, struct net_device { netdev_features_t features; + if (!skb_frags_readable(skb)) + goto out_kfree_skb; + features = netif_skb_features(skb); skb = validate_xmit_vlan(skb, features); if (unlikely(!skb)) |