| Message ID | 20240427182420.24673-1-nbd@nbd.name (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 59c878cbcdd80ed39315573b3511d0acfd3501b5 |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net,1/2] net: bridge: fix multicast-to-unicast with fraglist GSO | expand |
On Sat, 2024-04-27 at 20:24 +0200, Felix Fietkau wrote: > Calling skb_copy on a SKB_GSO_FRAGLIST skb is not valid, since it returns > an invalid linearized skb. This code only needs to change the ethernet > header, so pskb_copy is the right function to call here. > > Fixes: 6db6f0eae605 ("bridge: multicast to unicast") > Signed-off-by: Felix Fietkau <nbd@nbd.name> > --- > net/bridge/br_forward.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/net/bridge/br_forward.c b/net/bridge/br_forward.c > index 7431f89e897b..d7c35f55bd69 100644 > --- a/net/bridge/br_forward.c > +++ b/net/bridge/br_forward.c > @@ -266,7 +266,7 @@ static void maybe_deliver_addr(struct net_bridge_port *p, struct sk_buff *skb, > if (skb->dev == p->dev && ether_addr_equal(src, addr)) > return; > > - skb = skb_copy(skb, GFP_ATOMIC); > + skb = pskb_copy(skb, GFP_ATOMIC); > if (!skb) { > DEV_STATS_INC(dev, tx_dropped); > return; LGTM, but let's wait a little more time for Nikolay Acked-by: Paolo Abeni <pabeni@redhat.com>
On 27/04/2024 21:24, Felix Fietkau wrote: > Calling skb_copy on a SKB_GSO_FRAGLIST skb is not valid, since it returns > an invalid linearized skb. This code only needs to change the ethernet > header, so pskb_copy is the right function to call here. > > Fixes: 6db6f0eae605 ("bridge: multicast to unicast") > Signed-off-by: Felix Fietkau <nbd@nbd.name> > --- > net/bridge/br_forward.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/net/bridge/br_forward.c b/net/bridge/br_forward.c > index 7431f89e897b..d7c35f55bd69 100644 > --- a/net/bridge/br_forward.c > +++ b/net/bridge/br_forward.c > @@ -266,7 +266,7 @@ static void maybe_deliver_addr(struct net_bridge_port *p, struct sk_buff *skb, > if (skb->dev == p->dev && ether_addr_equal(src, addr)) > return; > > - skb = skb_copy(skb, GFP_ATOMIC); > + skb = pskb_copy(skb, GFP_ATOMIC); > if (!skb) { > DEV_STATS_INC(dev, tx_dropped); > return; Acked-by: Nikolay Aleksandrov <razor@blackwall.org>
Hello: This series was applied to netdev/net.git (main) by David S. Miller <davem@davemloft.net>: On Sat, 27 Apr 2024 20:24:18 +0200 you wrote: > Calling skb_copy on a SKB_GSO_FRAGLIST skb is not valid, since it returns > an invalid linearized skb. This code only needs to change the ethernet > header, so pskb_copy is the right function to call here. > > Fixes: 6db6f0eae605 ("bridge: multicast to unicast") > Signed-off-by: Felix Fietkau <nbd@nbd.name> > > [...] Here is the summary with links: - [net,1/2] net: bridge: fix multicast-to-unicast with fraglist GSO https://git.kernel.org/netdev/net/c/59c878cbcdd8 - [net,2/2] net: core: reject skb_copy(_expand) for fraglist GSO skbs https://git.kernel.org/netdev/net/c/d091e579b864 You are awesome, thank you!
diff --git a/net/bridge/br_forward.c b/net/bridge/br_forward.c index 7431f89e897b..d7c35f55bd69 100644 --- a/net/bridge/br_forward.c +++ b/net/bridge/br_forward.c @@ -266,7 +266,7 @@ static void maybe_deliver_addr(struct net_bridge_port *p, struct sk_buff *skb, if (skb->dev == p->dev && ether_addr_equal(src, addr)) return; - skb = skb_copy(skb, GFP_ATOMIC); + skb = pskb_copy(skb, GFP_ATOMIC); if (!skb) { DEV_STATS_INC(dev, tx_dropped); return;
Calling skb_copy on a SKB_GSO_FRAGLIST skb is not valid, since it returns an invalid linearized skb. This code only needs to change the ethernet header, so pskb_copy is the right function to call here. Fixes: 6db6f0eae605 ("bridge: multicast to unicast") Signed-off-by: Felix Fietkau <nbd@nbd.name> --- net/bridge/br_forward.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)