Revert "xfrm: esp: avoid in-place decrypt on shared skb frags"

PlaidCat · bmastbergen · commit d2f6155d6fbe · 2026-05-14T12:55:34.000-04:00
This reverts commit bb274cc.
diff --git a/net/ipv4/esp4.c b/net/ipv4/esp4.c
@@ -918,8 +918,7 @@ static int esp_input(struct xfrm_state *x, struct sk_buff *skb)
 			nfrags = 1;
 
 			goto skip_cow;
-		} else if (!skb_has_frag_list(skb) &&
-			   !skb_has_shared_frag(skb)) {
+		} else if (!skb_has_frag_list(skb)) {
 			nfrags = skb_shinfo(skb)->nr_frags;
 			nfrags++;
 
diff --git a/net/ipv4/ip_output.c b/net/ipv4/ip_output.c
@@ -1438,9 +1438,6 @@ ssize_t	ip_append_page(struct sock *sk, struct flowi4 *fl4, struct page *page,
 			goto error;
 		}
 
-		if (!(flags & MSG_NO_SHARED_FRAGS))
-			skb_shinfo(skb)->flags |= SKBFL_SHARED_FRAG;
-
 		if (skb->ip_summed == CHECKSUM_NONE) {
 			__wsum csum;
 			csum = csum_page(page, offset, len);

Original file line number	Diff line number	Diff line change
`@@ -1438,9 +1438,6 @@ ssize_t ip_append_page(struct sock sk, struct flowi4 fl4, struct page *page,`
`1438`	`1438`	`goto error;`
`1439`	`1439`	`}`
`1440`	`1440`
`1441`		`- if (!(flags & MSG_NO_SHARED_FRAGS))`
`1442`		`- skb_shinfo(skb)->flags \|= SKBFL_SHARED_FRAG;`
`1443`		`-`
`1444`	`1441`	`if (skb->ip_summed == CHECKSUM_NONE) {`
`1445`	`1442`	`__wsum csum;`
`1446`	`1443`	`csum = csum_page(page, offset, len);`