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

PlaidCat · bmastbergen · commit c63bd9bdcaf3 · 2026-05-14T12:45:54.000-04:00
This reverts commit 5c9ed6a.
diff --git a/net/ipv4/esp4.c b/net/ipv4/esp4.c
@@ -913,8 +913,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
@@ -1333,9 +1333,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)->tx_flags |= SKBTX_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
`@@ -1333,9 +1333,6 @@ ssize_t ip_append_page(struct sock sk, struct flowi4 fl4, struct page *page,`
`1333`	`1333`	`goto error;`
`1334`	`1334`	`}`
`1335`	`1335`
`1336`		`- if (!(flags & MSG_NO_SHARED_FRAGS))`
`1337`		`- skb_shinfo(skb)->tx_flags \|= SKBTX_SHARED_FRAG;`
`1338`		`-`
`1339`	`1336`	`if (skb->ip_summed == CHECKSUM_NONE) {`
`1340`	`1337`	`__wsum csum;`
`1341`	`1338`	`csum = csum_page(page, offset, len);`