diff options
| author | Andrey Zhizhikin <andrey.zhizhikin@leica-geosystems.com> | 2021-08-16 11:40:18 +0000 |
|---|---|---|
| committer | Andrey Zhizhikin <andrey.zhizhikin@leica-geosystems.com> | 2021-08-16 11:40:18 +0000 |
| commit | bbdb668ff5762f9a89f29fd88b5393b696499f38 (patch) | |
| tree | dc53ec1ad78a9a1abfdb64944b02e2f40719d9ad /net/core | |
| parent | ac38cd42037a9054ec38b7e31b2e3ddc90a0dbb5 (diff) | |
| parent | e350cd02e293be9a6b93398b2d3ff1edf7695ab2 (diff) | |
Merge tag 'v5.4.139' into 5.4-2.3.x-imx
This is the 5.4.139 stable release
Signed-off-by: Andrey Zhizhikin <andrey.zhizhikin@leica-geosystems.com>
Diffstat (limited to 'net/core')
| -rw-r--r-- | net/core/skbuff.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/net/core/skbuff.c b/net/core/skbuff.c index be7ac8adde3d..a172d2fe4ff1 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c @@ -2947,8 +2947,11 @@ skb_zerocopy_headlen(const struct sk_buff *from) if (!from->head_frag || skb_headlen(from) < L1_CACHE_BYTES || - skb_shinfo(from)->nr_frags >= MAX_SKB_FRAGS) + skb_shinfo(from)->nr_frags >= MAX_SKB_FRAGS) { hlen = skb_headlen(from); + if (!hlen) + hlen = from->len; + } if (skb_has_frag_list(from)) hlen = from->len; |