diff options
| author | Emanuele Ghidoli <emanuele.ghidoli@toradex.com> | 2023-08-30 12:39:41 +0200 |
|---|---|---|
| committer | Emanuele Ghidoli <emanuele.ghidoli@toradex.com> | 2023-08-30 12:39:41 +0200 |
| commit | 671546ba6491ab10e2c0d3dfa2adbaab205cee0d (patch) | |
| tree | a4aab919641c1f2b161c10355a33926fe55ff15d /net/core | |
| parent | c4eba2cbafff7d770dd4e40ba9168bd4f0f2047f (diff) | |
| parent | 0ab06468cbd149aac0d7f216ec00452ff8c74e0b (diff) | |
Merge tag 'v5.15.114' into 5.15-2.2.x-imx
This is the 5.15.114 stable release
Conflicts:
drivers/regulator/pca9450-regulator.c
drivers/usb/dwc3/core.h
Signed-off-by: Emanuele Ghidoli <emanuele.ghidoli@toradex.com>
Diffstat (limited to 'net/core')
| -rw-r--r-- | net/core/skbuff.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/net/core/skbuff.c b/net/core/skbuff.c index 7cee8644af22..c2ca94575148 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c @@ -4987,8 +4987,10 @@ void __skb_tstamp_tx(struct sk_buff *orig_skb, } else { skb = skb_clone(orig_skb, GFP_ATOMIC); - if (skb_orphan_frags_rx(skb, GFP_ATOMIC)) + if (skb_orphan_frags_rx(skb, GFP_ATOMIC)) { + kfree_skb(skb); return; + } } if (!skb) return; |