diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2021-01-16 19:06:01 -0800 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2021-01-16 19:06:01 -0800 |
| commit | 213b97b125808aa220ba460a7af09d8f3772f669 (patch) | |
| tree | 35f127d43a7ff29fe266342bb55d0b9d396dad38 | |
| parent | 20efd2c79afbd8f0a3929edb9b8ab5ce4c83fb6f (diff) | |
| parent | 1fef8544bf41fb77d6603feb9a31cd76b4578489 (diff) | |
Merge branch 'net-fix-the-features-flag-in-sctp_gso_segment'
Xin Long says:
====================
net: fix the features flag in sctp_gso_segment
Patch 1/2 is to improve the code in skb_segment(), and it is needed
by Patch 2/2.
====================
Link: https://lore.kernel.org/r/cover.1610703289.git.lucien.xin@gmail.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
| -rw-r--r-- | net/core/skbuff.c | 11 | ||||
| -rw-r--r-- | net/sctp/offload.c | 2 |
2 files changed, 7 insertions, 6 deletions
diff --git a/net/core/skbuff.c b/net/core/skbuff.c index 60390696e184..e835193cabcc 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c @@ -3894,12 +3894,8 @@ normal: } hsize = skb_headlen(head_skb) - offset; - if (hsize < 0) - hsize = 0; - if (hsize > len || !sg) - hsize = len; - if (!hsize && i >= nfrags && skb_headlen(list_skb) && + if (hsize <= 0 && i >= nfrags && skb_headlen(list_skb) && (skb_headlen(list_skb) == len || sg)) { BUG_ON(skb_headlen(list_skb) > len); @@ -3942,6 +3938,11 @@ normal: skb_release_head_state(nskb); __skb_push(nskb, doffset); } else { + if (hsize > len || !sg) + hsize = len; + else if (hsize < 0) + hsize = 0; + nskb = __alloc_skb(hsize + doffset + headroom, GFP_ATOMIC, skb_alloc_rx_flag(head_skb), NUMA_NO_NODE); diff --git a/net/sctp/offload.c b/net/sctp/offload.c index ce281a9a2875..eb874e3c399a 100644 --- a/net/sctp/offload.c +++ b/net/sctp/offload.c @@ -68,7 +68,7 @@ static struct sk_buff *sctp_gso_segment(struct sk_buff *skb, goto out; } - segs = skb_segment(skb, features | NETIF_F_HW_CSUM | NETIF_F_SG); + segs = skb_segment(skb, (features | NETIF_F_HW_CSUM) & ~NETIF_F_SG); if (IS_ERR(segs)) goto out; |