Linux 5.10.255
Greg Kroah-Hartman
maintainerI'm announcing the release of the 5.10.255 kernel.
All users of the 5.10 kernel series must upgrade.
The updated 5.10.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-5.10.y
and can be browsed at the normal kernel.org git web browser:
https://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary
thanks,
greg k-h
------------
Makefile | 2 +- net/ipv4/esp4.c | 3 ++- net/ipv4/ip_output.c | 2 ++ net/ipv6/esp6.c | 3 ++- 4 files changed, 7 insertions(+), 3 deletions(-)
Greg Kroah-Hartman (1):
Linux 5.10.255
Kuan-Ting Chen (1):
xfrm: esp: avoid in-place decrypt on shared skb frags
Greg Kroah-Hartman
maintainerMakefile +1 -1
@@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0 VERSION = 5 PATCHLEVEL = 10 -SUBLEVEL = 254 +SUBLEVEL = 255 EXTRAVERSION = NAME = Dare mighty things
net/ipv4/esp4.c +2 -1
@@ -921,7 +921,8 @@ static int esp_input(struct xfrm_state *x, struct sk_buff *skb) nfrags =1 ; goto skip_cow; - }else if (!skb_has_frag_list (skb)) { + }else if (!skb_has_frag_list (skb) && + !skb_has_shared_frag (skb)) { nfrags =skb_shinfo (skb)->nr_frags; nfrags++;
net/ipv4/ip_output.c +2 -0
@@ -1447,6 +1447,8 @@ ssize_t ip_append_page(struct sock *sk, struct flowi4 *fl4, struct page *page, goto error; } +skb_shinfo (skb)->tx_flags |=SKBTX_SHARED_FRAG ; +if (skb->ip_summed ==CHECKSUM_NONE ) {__wsum csum; csum =csum_page (page, offset, len);
net/ipv6/esp6.c +2 -1
@@ -966,7 +966,8 @@ static int esp6_input(struct xfrm_state *x, struct sk_buff *skb) nfrags =1 ; goto skip_cow; - }else if (!skb_has_frag_list (skb)) { + }else if (!skb_has_frag_list (skb) && + !skb_has_shared_frag (skb)) { nfrags =skb_shinfo (skb)->nr_frags; nfrags++;