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

            A new commit has been pushed.

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

            Log:
            kernel-7.1.2-201

* Wed Jul 01 2026 Justin M. Forbes <jforbes@fedoraproject.org> [7.1.2-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 8df6322..ed5c919 100644
--- a/Patchlist.changelog
+++ b/Patchlist.changelog
@@ -1,3 +1,9 @@
+https://gitlab.com/cki-project/kernel-ark/-/commit/7a09b757ef198b2dfc48dad4a1d3e908e26af396
+ 7a09b757ef198b2dfc48dad4a1d3e908e26af396 ipv6: account for fraggap on the paged allocation path
+
+https://gitlab.com/cki-project/kernel-ark/-/commit/8123ee94b7edcbb90e11f2b2f096b19c35b40468
+ 8123ee94b7edcbb90e11f2b2f096b19c35b40468 ipv4: account for fraggap on the paged allocation path
+
 https://gitlab.com/cki-project/kernel-ark/-/commit/6222fdcaf90eebe751f3561d012542e5748e860a
  6222fdcaf90eebe751f3561d012542e5748e860a Revert "Input: rmi4 - remove the need for artificial IRQ in case of HID"
 

diff --git a/kernel.changelog b/kernel.changelog
index 3b03cb2..3bf1539 100644
--- a/kernel.changelog
+++ b/kernel.changelog
@@ -1,3 +1,8 @@
+* Wed Jul 01 2026 Justin M. Forbes <jforbes@fedoraproject.org> [7.1.2-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.1.2-0]
 - Revert "Input: rmi4 - remove the need for artificial IRQ in case of HID" (Justin M. Forbes)
 - drm/i915/mtl+: Enable PPS before PLL (Imre Deak)

diff --git a/kernel.spec b/kernel.spec
index b34a837..55a188b 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -190,13 +190,13 @@ Summary: The Linux kernel
 %define specrpmversion 7.1.2
 %define specversion 7.1.2
 %define patchversion 7.1
-%define pkgrelease 200
+%define pkgrelease 201
 %define kversion 7
 %define tarfile_release 7.1.2
 # This is needed to do merge window version magic
 %define patchlevel 1
 # This allows pkg_release to have configurable %%{?dist} tag
-%define specrelease 200%{?buildid}%{?dist}
+%define specrelease 201%{?buildid}%{?dist}
 # This defines the kabi tarball version
 %define kabiversion 7.1.2
 
@@ -4857,6 +4857,10 @@ fi\
 #
 #
 %changelog
+* Wed Jul 01 2026 Justin M. Forbes <jforbes@fedoraproject.org> [7.1.2-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.1.2-0]
 - Revert "Input: rmi4 - remove the need for artificial IRQ in case of HID" (Justin M. Forbes)
 - drm/i915/mtl+: Enable PPS before PLL (Imre Deak)

diff --git a/patch-7.1-redhat.patch b/patch-7.1-redhat.patch
index e6c0932..f0761df 100644
--- a/patch-7.1-redhat.patch
+++ b/patch-7.1-redhat.patch
@@ -36,6 +36,8 @@
  include/linux/random.h                             |  10 ++
  include/linux/security.h                           |   9 ++
  kernel/module/signing.c                            |   9 +-
+ 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 +-
@@ -46,7 +48,7 @@
  tools/testing/selftests/bpf/DENYLIST.rhel          |  76 ++++++++++
  tools/testing/selftests/bpf/Makefile               |   2 +-
  tools/testing/selftests/bpf/prog_tests/ksyms_btf.c |  31 -----
- 48 files changed, 931 insertions(+), 142 deletions(-)
+ 50 files changed, 936 insertions(+), 153 deletions(-)
 
 diff --git a/Makefile b/Makefile
 index 78662694be58..6b19d87229d5 100644
@@ -1668,6 +1670,58 @@ index 590ba29c85ab..02153d857531 100644
  }
  
  int module_sig_check(struct load_info *info, int flags)
+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 c14adcdd4396..b5d9c57fe439 100644
+--- a/net/ipv6/ip6_output.c
++++ b/net/ipv6/ip6_output.c
+@@ -1668,8 +1668,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;
+ 
+@@ -1684,10 +1684,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 0cc04f3..36637be 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
 SHA512 (linux-7.1.2.tar.xz) = 8882202eefbcb6c7b898e48dd923f5d48db98eea632905350a7e6ca5dd6b33388b144f6dddccdf6bb524469c9d81ec32ac0e173bc2a5541dca3a21aada8ea5db
-SHA512 (kernel-abi-stablelists-7.1.2.tar.xz) = 1cb8f09771747b15eae58c9a7f598f7ca05c387ca0159586702fec9b03e83e21646dcafdd84db4ec0a133175a28316b8211147959c832b293785e7347b623da1
-SHA512 (kernel-kabi-dw-7.1.2.tar.xz) = 3152209fd138af5d6d006486881575ab1cb77d67b6eaf27a60ff0021d4845d5bb4c68c8f495ed78f11fef7de027b223a733a641af94400b64f80a9a0b71e2d63
+SHA512 (kernel-abi-stablelists-7.1.2.tar.xz) = 86d8c01fb5af9461a4f21663bdb5a02d9d643a321fef097e9e8e5c3ef80b4fe7ded298eacf67a024ca5b9b721183e7f9c20364c27d42872b04e11f0997659f20
+SHA512 (kernel-kabi-dw-7.1.2.tar.xz) = 95911602d71fa64ebb80a2feedb605f95b3c033dcbb8dc50cd8414a58e8a739aaa5bc5a6421d145877dde3d9b69498ec887fc3713701a3e27815e424ff90f763

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

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

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-07-01 17:45 [rpms/kernel] stabilization: kernel-7.1.2-201 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