kernel-7.0.14-201
* 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>
This commit is contained in:
Justin M. Forbes
parent
327bfc563b
commit
ff20f69bc3
6 changed files with 75 additions and 6 deletions
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -190,13 +190,13 @@ Summary: The Linux kernel
|
|||
%define specrpmversion 7.0.14
|
||||
%define specversion 7.0.14
|
||||
%define patchversion 7.0
|
||||
%define pkgrelease 200
|
||||
%define pkgrelease 201
|
||||
%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 200%{?buildid}%{?dist}
|
||||
%define specrelease 201%{?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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
4
sources
4
sources
|
|
@ -1,3 +1,3 @@
|
|||
SHA512 (linux-7.0.14.tar.xz) = 8738f4c70b3c9b12135d0321d70c7ced75a0a05ab4dc9da1f66426c78487a5a79e4c43c7b5faa4d2c58db32f776562a3370f6d5ca579239e0507535135d4e781
|
||||
SHA512 (kernel-abi-stablelists-7.0.14.tar.xz) = 98979ce954629a16d9fbcedaf5f4b06425a3e4080dd0e1743afbbec451ef6284463676346b8367f720238db03006fab5cb1d005988902cd47a883178967d13a1
|
||||
SHA512 (kernel-kabi-dw-7.0.14.tar.xz) = af25d6ec26bf8c50c43697c5dee13807267a5ddfcb2e2d32277679fa467d94db8f093664c8a61d239e083a0adb6d180cb9f6c285af33b91a35a7bf1b8ec6526f
|
||||
SHA512 (kernel-abi-stablelists-7.0.14.tar.xz) = 62edb47471676578a3b6f530357360f7fc8225bcc8a70da9558f7db20fb7aad050622839e0c84c932dc7a2c6cf2cc830bb49931faf187d793fcd10f39a35468e
|
||||
SHA512 (kernel-kabi-dw-7.0.14.tar.xz) = fc6fae557a9fecb2e7769eefae35369e81092b85938c0126ee14d5862c223a7a40b7c6098a9a9ae08e8a588a8596d3533a967e228e9eab4c34f544087d4c7e38
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue