]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
xfrm: esp: ipv4: fix up flags setting
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 8 May 2026 14:26:10 +0000 (16:26 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 8 May 2026 14:31:16 +0000 (16:31 +0200)
In commit ab8b995323e5 ("xfrm: esp: avoid in-place decrypt on shared skb
frags") in the 5.15.y tree, the tx_flags variable was set, instead of
flags.  This was due to me backporting the 6.1.y version of Ben's
version of the backport and not realizing the variable needed to be
different, so this was my fault, not his.

Link: https://lore.kernel.org/r/1b941a1353791ddd6fd75fb8e68b377367d689ff.camel@oracle.com
Reported-by: Dominik Grzegorzek <dominik.grzegorzek@oracle.com>
Reported-by: Massimiliano Pellizzer <mpellizzer.dev@gmail.com>
Cc: Ben Hutchings <benh@debian.org>
Fixes: ab8b995323e5 ("xfrm: esp: avoid in-place decrypt on shared skb frags")
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
net/ipv4/ip_output.c

index 68509e1f89b5b0f544f4c1b1747ef31e52b4adcb..5d8f8a5901bc64724f27f0b3b0e068e03e65513f 100644 (file)
@@ -1443,7 +1443,7 @@ ssize_t   ip_append_page(struct sock *sk, struct flowi4 *fl4, struct page *page,
                        goto error;
                }
 
-               skb_shinfo(skb)->tx_flags |= SKBFL_SHARED_FRAG;
+               skb_shinfo(skb)->flags |= SKBFL_SHARED_FRAG;
 
                if (skb->ip_summed == CHECKSUM_NONE) {
                        __wsum csum;