diff options
| author | Paolo Abeni <pabeni@redhat.com> | 2023-04-26 10:17:46 +0200 |
|---|---|---|
| committer | Paolo Abeni <pabeni@redhat.com> | 2023-04-26 10:17:46 +0200 |
| commit | c248b27cfc0a8a5fee93e000d47e659bca335d0f (patch) | |
| tree | e4898df753acf2d2d9885844ea37b9f03ccf661c /net/core/skbuff.c | |
| parent | net: phy: marvell-88x2222: remove unnecessary (void*) conversions (diff) | |
| parent | tcp/udp: Fix memleaks of sk and zerocopy skbs with TX timestamp. (diff) | |
| download | linux-c248b27cfc0a8a5fee93e000d47e659bca335d0f.tar.xz linux-c248b27cfc0a8a5fee93e000d47e659bca335d0f.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
No conflicts.
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Diffstat (limited to 'net/core/skbuff.c')
| -rw-r--r-- | net/core/skbuff.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/net/core/skbuff.c b/net/core/skbuff.c index c7c141f6fc14..2112146092bf 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c @@ -5215,6 +5215,9 @@ void __skb_tstamp_tx(struct sk_buff *orig_skb, skb = alloc_skb(0, GFP_ATOMIC); } else { skb = skb_clone(orig_skb, GFP_ATOMIC); + + if (skb_orphan_frags_rx(skb, GFP_ATOMIC)) + return; } if (!skb) return; |