public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/kernel] f43: kernel-7.0.14-101
@ 2026-07-01 13:25 Justin M. Forbes
  0 siblings, 0 replies; only message in thread
From: Justin M. Forbes @ 2026-07-01 13:25 UTC (permalink / raw)
  To: git-commits

            A new commit has been pushed.

            Repo   : rpms/kernel
            Branch : f43
            Commit : ce1832086eae34ee43d867f8a4a7ca2a21349d66
            Author : Justin M. Forbes <jforbes@fedoraproject.org>
            Date   : 2026-07-01T07:25:18-06:00
            Stats  : +75/-6 in 6 file(s)
            URL    : https://src.fedoraproject.org/rpms/kernel/c/ce1832086eae34ee43d867f8a4a7ca2a21349d66?branch=f43

            Log:
            kernel-7.0.14-101

* Wed Jul 01 2026 Justin M. Forbes <jforbes@fedoraproject.org> [7.0.14-1]
- ipv6: account for fraggap on the paged allocation path (Wongi Lee)
- ipv4: account for fraggap on the paged allocation path (Wongi Lee)
Resolves:

Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>

---
diff --git a/Makefile.rhelver b/Makefile.rhelver
index 95b9fd7..e810b89 100644
--- a/Makefile.rhelver
+++ b/Makefile.rhelver
@@ -12,7 +12,7 @@ RHEL_MINOR = 99
 #
 # Use this spot to avoid future merge conflicts.
 # Do not trim this comment.
-RHEL_RELEASE = 0
+RHEL_RELEASE = 1
 
 #
 # RHEL_REBASE_NUM

diff --git a/Patchlist.changelog b/Patchlist.changelog
index 746f37b..1b547b6 100644
--- a/Patchlist.changelog
+++ b/Patchlist.changelog
@@ -1,3 +1,9 @@
+https://gitlab.com/cki-project/kernel-ark/-/commit/12634a3a24b61cc9c448076695bcfe4b08f46640
+ 12634a3a24b61cc9c448076695bcfe4b08f46640 ipv6: account for fraggap on the paged allocation path
+
+https://gitlab.com/cki-project/kernel-ark/-/commit/3a65f78941f5100874120706b09ac76a652b7fc1
+ 3a65f78941f5100874120706b09ac76a652b7fc1 ipv4: account for fraggap on the paged allocation path
+
 https://gitlab.com/cki-project/kernel-ark/-/commit/59c9d62056dd1ed960b229779595157236fa3f45
  59c9d62056dd1ed960b229779595157236fa3f45 Revert "Input: rmi4 - remove the need for artificial IRQ in case of HID"
 

diff --git a/kernel.changelog b/kernel.changelog
index c9ea73d..63cdc03 100644
--- a/kernel.changelog
+++ b/kernel.changelog
@@ -1,3 +1,8 @@
+* Wed Jul 01 2026 Justin M. Forbes <jforbes@fedoraproject.org> [7.0.14-1]
+- ipv6: account for fraggap on the paged allocation path (Wongi Lee)
+- ipv4: account for fraggap on the paged allocation path (Wongi Lee)
+Resolves: 
+
 * Sat Jun 27 2026 Justin M. Forbes <jforbes@fedoraproject.org> [7.0.14-0]
 - Revert "Input: rmi4 - remove the need for artificial IRQ in case of HID" (Justin M. Forbes)
 - Linux v7.0.14

diff --git a/kernel.spec b/kernel.spec
index 27daf47..3f1aec1 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -190,13 +190,13 @@ Summary: The Linux kernel
 %define specrpmversion 7.0.14
 %define specversion 7.0.14
 %define patchversion 7.0
-%define pkgrelease 100
+%define pkgrelease 101
 %define kversion 7
 %define tarfile_release 7.0.14
 # This is needed to do merge window version magic
 %define patchlevel 0
 # This allows pkg_release to have configurable %%{?dist} tag
-%define specrelease 100%{?buildid}%{?dist}
+%define specrelease 101%{?buildid}%{?dist}
 # This defines the kabi tarball version
 %define kabiversion 7.0.14
 
@@ -4825,6 +4825,10 @@ fi\
 #
 #
 %changelog
+* Wed Jul 01 2026 Justin M. Forbes <jforbes@fedoraproject.org> [7.0.14-1]
+- ipv6: account for fraggap on the paged allocation path (Wongi Lee)
+- ipv4: account for fraggap on the paged allocation path (Wongi Lee)
+
 * Sat Jun 27 2026 Justin M. Forbes <jforbes@fedoraproject.org> [7.0.14-0]
 - Revert "Input: rmi4 - remove the need for artificial IRQ in case of HID" (Justin M. Forbes)
 - Linux v7.0.14

diff --git a/patch-7.0-redhat.patch b/patch-7.0-redhat.patch
index ccdf0b4..bc20c86 100644
--- a/patch-7.0-redhat.patch
+++ b/patch-7.0-redhat.patch
@@ -67,6 +67,8 @@
  include/linux/security.h                           |    9 +
  kernel/module/signing.c                            |    9 +-
  net/core/gro.c                                     |    3 +
+ net/ipv4/ip_output.c                               |    7 +-
+ net/ipv6/ip6_output.c                              |    9 +-
  scripts/Makefile.lib                               |    3 +
  scripts/tags.sh                                    |    2 +
  security/integrity/platform_certs/load_uefi.c      |    6 +-
@@ -77,7 +79,7 @@
  sound/soc/codecs/rt722-sdca.h                      |    4 +
  tools/testing/selftests/bpf/Makefile               |    2 +-
  tools/testing/selftests/bpf/prog_tests/ksyms_btf.c |   31 -
- 79 files changed, 5424 insertions(+), 459 deletions(-)
+ 81 files changed, 5429 insertions(+), 470 deletions(-)
 
 diff --git a/Documentation/admin-guide/media/amdisp4-1.rst b/Documentation/admin-guide/media/amdisp4-1.rst
 new file mode 100644
@@ -7307,6 +7309,58 @@ index 35f2f708f010..f773e9facfa4 100644
  	if (headlen <= offset) {
  		skb_frag_t *frag;
  		skb_frag_t *frag2;
+diff --git a/net/ipv4/ip_output.c b/net/ipv4/ip_output.c
+index 5bcd73cbdb41..ec790bad1679 100644
+--- a/net/ipv4/ip_output.c
++++ b/net/ipv4/ip_output.c
+@@ -1117,8 +1117,8 @@ static int __ip_append_data(struct sock *sk,
+ 				  !(rt->dst.dev->features & NETIF_F_SG)))
+ 				alloclen = fraglen;
+ 			else {
+-				alloclen = fragheaderlen + transhdrlen;
+-				pagedlen = datalen - transhdrlen;
++				alloclen = fragheaderlen + transhdrlen + fraggap;
++				pagedlen = datalen - transhdrlen - fraggap;
+ 			}
+ 
+ 			alloclen += alloc_extra;
+@@ -1165,9 +1165,6 @@ static int __ip_append_data(struct sock *sk,
+ 			}
+ 
+ 			copy = datalen - transhdrlen - fraggap - pagedlen;
+-			/* [!] NOTE: copy will be negative if pagedlen>0
+-			 * because then the equation reduces to -fraggap.
+-			 */
+ 			if (copy > 0 &&
+ 			    INDIRECT_CALL_1(getfrag, ip_generic_getfrag,
+ 					    from, data + transhdrlen, offset,
+diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c
+index 3f14e363c96e..d2aa48a0acaa 100644
+--- a/net/ipv6/ip6_output.c
++++ b/net/ipv6/ip6_output.c
+@@ -1636,8 +1636,8 @@ static int __ip6_append_data(struct sock *sk,
+ 				  !(rt->dst.dev->features & NETIF_F_SG)))
+ 				alloclen = fraglen;
+ 			else {
+-				alloclen = fragheaderlen + transhdrlen;
+-				pagedlen = datalen - transhdrlen;
++				alloclen = fragheaderlen + transhdrlen + fraggap;
++				pagedlen = datalen - transhdrlen - fraggap;
+ 			}
+ 			alloclen += alloc_extra;
+ 
+@@ -1652,10 +1652,7 @@ static int __ip6_append_data(struct sock *sk,
+ 			fraglen = datalen + fragheaderlen;
+ 
+ 			copy = datalen - transhdrlen - fraggap - pagedlen;
+-			/* [!] NOTE: copy may be negative if pagedlen>0
+-			 * because then the equation may reduces to -fraggap.
+-			 */
+-			if (copy < 0 && !(flags & MSG_SPLICE_PAGES)) {
++			if (copy < 0) {
+ 				err = -EINVAL;
+ 				goto error;
+ 			}
 diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib
 index 0718e39cedda..10e94a1b8b6e 100644
 --- a/scripts/Makefile.lib

diff --git a/sources b/sources
index 199e8fa..096dcb0 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
 SHA512 (linux-7.0.14.tar.xz) = 8738f4c70b3c9b12135d0321d70c7ced75a0a05ab4dc9da1f66426c78487a5a79e4c43c7b5faa4d2c58db32f776562a3370f6d5ca579239e0507535135d4e781
-SHA512 (kernel-abi-stablelists-7.0.14.tar.xz) = 510f19291d152e0d67b2bd24d3b3a16e54d7c8cfc1c0703cdf368bde92395172fda74e9fd8b806d0107625ff870ba2032b158b2400e2d09b6078add977a55657
-SHA512 (kernel-kabi-dw-7.0.14.tar.xz) = af25d6ec26bf8c50c43697c5dee13807267a5ddfcb2e2d32277679fa467d94db8f093664c8a61d239e083a0adb6d180cb9f6c285af33b91a35a7bf1b8ec6526f
+SHA512 (kernel-abi-stablelists-7.0.14.tar.xz) = 13c723f426ba1d4dfbea6916f7b26d0a08568afac15e81cc26aa8bd9347e84d85b844304fb3030151801dc9172c504f457a13158719d4bebc4880a87a3e075f8
+SHA512 (kernel-kabi-dw-7.0.14.tar.xz) = fc6fae557a9fecb2e7769eefae35369e81092b85938c0126ee14d5862c223a7a40b7c6098a9a9ae08e8a588a8596d3533a967e228e9eab4c34f544087d4c7e38

^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2026-07-01 13:25 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-07-01 13:25 [rpms/kernel] f43: kernel-7.0.14-101 Justin M. Forbes

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox