Linux 7.0.5

Linux 7.0.5

[Greg Kroah-Hartman]

I'm announcing the release of the 7.0.5 kernel.

All users of the 7.0 kernel series must upgrade.

The updated 7.0.y git tree can be found at:
	git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-7.0.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 ++-
 net/ipv6/ip6_output.c |    2 ++
 5 files changed, 9 insertions(+), 3 deletions(-)

Greg Kroah-Hartman (1):
      Linux 7.0.5

Kuan-Ting Chen (1):
      xfrm: esp: avoid in-place decrypt on shared skb frags

Re: Linux 7.0.5

[Greg Kroah-Hartman]

diff --git a/Makefile b/Makefile
index 316c0c4ebe5c..6694d125285e 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: GPL-2.0
 VERSION = 7
 PATCHLEVEL = 0
-SUBLEVEL = 4
+SUBLEVEL = 5
 EXTRAVERSION =
 NAME = Baby Opossum Posse
 
diff --git a/net/ipv4/esp4.c b/net/ipv4/esp4.c
index 6dfc0bcdef65..6a5febbdbee4 100644
--- a/net/ipv4/esp4.c
+++ b/net/ipv4/esp4.c
@@ -873,7 +873,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++;
 
diff --git a/net/ipv4/ip_output.c b/net/ipv4/ip_output.c
index e4790cc7b5c2..5bcd73cbdb41 100644
--- a/net/ipv4/ip_output.c
+++ b/net/ipv4/ip_output.c
@@ -1233,6 +1233,8 @@ static int __ip_append_data(struct sock *sk,
 			if (err < 0)
 				goto error;
 			copy = err;
+			if (!(flags & MSG_NO_SHARED_FRAGS))
+				skb_shinfo(skb)->flags |= SKBFL_SHARED_FRAG;
 			wmem_alloc_delta += copy;
 		} else if (!zc) {
 			int i = skb_shinfo(skb)->nr_frags;
diff --git a/net/ipv6/esp6.c b/net/ipv6/esp6.c
index 9f75313734f8..9c06c5a1419d 100644
--- a/net/ipv6/esp6.c
+++ b/net/ipv6/esp6.c
@@ -915,7 +915,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++;
 
diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c
index 8e2a6b28cea7..3f14e363c96e 100644
--- a/net/ipv6/ip6_output.c
+++ b/net/ipv6/ip6_output.c
@@ -1765,6 +1765,8 @@ static int __ip6_append_data(struct sock *sk,
 			if (err < 0)
 				goto error;
 			copy = err;
+			if (!(flags & MSG_NO_SHARED_FRAGS))
+				skb_shinfo(skb)->flags |= SKBFL_SHARED_FRAG;
 			wmem_alloc_delta += copy;
 		} else if (!zc) {
 			int i = skb_shinfo(skb)->nr_frags;

Re: Linux 7.0.5

[Peter Jung]

On 5/8/26 09:24, Greg Kroah-Hartman wrote:
> I'm announcing the release of the 7.0.5 kernel.
> 
> All users of the 7.0 kernel series must upgrade.
> 
> The updated 7.0.y git tree can be found at:
> 	git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-7.0.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 ++-
>   net/ipv6/ip6_output.c |    2 ++
>   5 files changed, 9 insertions(+), 3 deletions(-)
> 
> Greg Kroah-Hartman (1):
>        Linux 7.0.5
> 
> Kuan-Ting Chen (1):
>        xfrm: esp: avoid in-place decrypt on shared skb frags
> 

Hi Gregh,

Thank you for pushing so fat out a release.
In the Alma Linux post its mentioned a second, not merged commit is also 
needed: https://almalinux.org/blog/2026-05-07-dirty-frag/

https://lore.kernel.org/all/afKV2zGR6rrelPC7@v4bel/

Is this one not included yet, because it was not merged into mainline yet?

Thanks in advance

Peter

Re: Linux 7.0.5

[Greg Kroah-Hartman]

On Fri, May 08, 2026 at 10:15:15AM +0200, Peter Jung wrote:
> On 5/8/26 09:24, Greg Kroah-Hartman wrote:
> > I'm announcing the release of the 7.0.5 kernel.
> > 
> > All users of the 7.0 kernel series must upgrade.
> > 
> > The updated 7.0.y git tree can be found at:
> > 	git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-7.0.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 ++-
> >   net/ipv6/ip6_output.c |    2 ++
> >   5 files changed, 9 insertions(+), 3 deletions(-)
> > 
> > Greg Kroah-Hartman (1):
> >        Linux 7.0.5
> > 
> > Kuan-Ting Chen (1):
> >        xfrm: esp: avoid in-place decrypt on shared skb frags
> > 
> 
> Hi Gregh,
> 
> Thank you for pushing so fat out a release.
> In the Alma Linux post its mentioned a second, not merged commit is also
> needed: https://almalinux.org/blog/2026-05-07-dirty-frag/
> 
> https://lore.kernel.org/all/afKV2zGR6rrelPC7@v4bel/
> 
> Is this one not included yet, because it was not merged into mainline yet?

That is correct, it is not merged anywhere yet as a v2 was just posted,
as you can see from that thread.

thanks,

greg k-h

Re: Linux 7.0.5

[Greg Kroah-Hartman]

On Fri, May 08, 2026 at 10:42:57AM +0200, Greg Kroah-Hartman wrote:
> On Fri, May 08, 2026 at 10:15:15AM +0200, Peter Jung wrote:
> > On 5/8/26 09:24, Greg Kroah-Hartman wrote:
> > > I'm announcing the release of the 7.0.5 kernel.
> > > 
> > > All users of the 7.0 kernel series must upgrade.
> > > 
> > > The updated 7.0.y git tree can be found at:
> > > 	git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-7.0.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 ++-
> > >   net/ipv6/ip6_output.c |    2 ++
> > >   5 files changed, 9 insertions(+), 3 deletions(-)
> > > 
> > > Greg Kroah-Hartman (1):
> > >        Linux 7.0.5
> > > 
> > > Kuan-Ting Chen (1):
> > >        xfrm: esp: avoid in-place decrypt on shared skb frags
> > > 
> > 
> > Hi Gregh,
> > 
> > Thank you for pushing so fat out a release.
> > In the Alma Linux post its mentioned a second, not merged commit is also
> > needed: https://almalinux.org/blog/2026-05-07-dirty-frag/
> > 
> > https://lore.kernel.org/all/afKV2zGR6rrelPC7@v4bel/
> > 
> > Is this one not included yet, because it was not merged into mainline yet?
> 
> That is correct, it is not merged anywhere yet as a v2 was just posted,
> as you can see from that thread.

And a v3 will be forthcoming...