6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Steffen Klassert [ Upstream commit 0fda52de8bbd4ca9a852c8a7ef6536cf82bd71fd ] This reverts commit 21697720ff43b8dfa25b8e8d9ca7f56f4597fc80. The patch does not fix the issue completely, so revert for now and wait for an updated version. Signed-off-by: Steffen Klassert Signed-off-by: Sasha Levin --- net/ipv4/esp4.c | 7 ------- net/ipv6/esp6.c | 7 ------- 2 files changed, 14 deletions(-) diff --git a/net/ipv4/esp4.c b/net/ipv4/esp4.c index 908775cdb8fc6..55b5c890b15a8 100644 --- a/net/ipv4/esp4.c +++ b/net/ipv4/esp4.c @@ -103,13 +103,6 @@ static void esp_ssg_unref(struct xfrm_state *x, void *tmp, struct sk_buff *skb) struct aead_request *req; struct scatterlist *sg; - /* Managed frags are owned by the zerocopy ubuf; the skb holds no - * per-frag page reference, so we must not drop one here. Mirrors - * the SKBFL_MANAGED_FRAG_REFS handling in skb_release_data(). - */ - if (skb_zcopy_managed(skb)) - return; - if (x->props.flags & XFRM_STATE_ESN) extralen += sizeof(struct esp_output_extra); diff --git a/net/ipv6/esp6.c b/net/ipv6/esp6.c index a90c9f4c5fd02..72490d27d15f5 100644 --- a/net/ipv6/esp6.c +++ b/net/ipv6/esp6.c @@ -120,13 +120,6 @@ static void esp_ssg_unref(struct xfrm_state *x, void *tmp, struct sk_buff *skb) struct aead_request *req; struct scatterlist *sg; - /* Managed frags are owned by the zerocopy ubuf; the skb holds no - * per-frag page reference, so we must not drop one here. Mirrors - * the SKBFL_MANAGED_FRAG_REFS handling in skb_release_data(). - */ - if (skb_zcopy_managed(skb)) - return; - if (x->props.flags & XFRM_STATE_ESN) extralen += sizeof(struct esp_output_extra); -- 2.53.0