From 7c0a92f0e11a440369816777576d0a990535b8f0 Mon Sep 17 00:00:00 2001 From: almalinux-bot-kernel Date: Sun, 26 Jul 2026 05:13:21 +0000 Subject: [PATCH] Import of kernel-6.12.0-211.38.1.el10_2 --- COPYING-6.12.0-211.37.1.el10 => COPYING-6.12.0-211.38.1.el10 | 0 Makefile.rhelver | 2 +- kernel.sbat | 2 +- net/core/gro.c | 3 +++ redhat/kernel.changelog-10.2 | 4 ++++ uki-addons.sbat | 2 +- uki.sbat | 2 +- 7 files changed, 11 insertions(+), 4 deletions(-) rename COPYING-6.12.0-211.37.1.el10 => COPYING-6.12.0-211.38.1.el10 (100%) diff --git a/COPYING-6.12.0-211.37.1.el10 b/COPYING-6.12.0-211.38.1.el10 similarity index 100% rename from COPYING-6.12.0-211.37.1.el10 rename to COPYING-6.12.0-211.38.1.el10 diff --git a/Makefile.rhelver b/Makefile.rhelver index 8193ded8dc..470568593e 100644 --- a/Makefile.rhelver +++ b/Makefile.rhelver @@ -12,7 +12,7 @@ RHEL_MINOR = 2 # # Use this spot to avoid future merge conflicts. # Do not trim this comment. -RHEL_RELEASE = 211.37.1 +RHEL_RELEASE = 211.38.1 # # RHEL_REBASE_NUM diff --git a/kernel.sbat b/kernel.sbat index 50544aefea..3a51266ac8 100644 --- a/kernel.sbat +++ b/kernel.sbat @@ -1,2 +1,2 @@ sbat,1,SBAT Version,sbat,1,https://github.com/rhboot/shim/blob/main/SBAT.md -kernel.almalinux,1,AlmaLinux,kernel-core,6.12.0-211.37.1.el10.x86_64,mailto:security@almalinux.org +kernel.almalinux,1,AlmaLinux,kernel-core,6.12.0-211.38.1.el10.x86_64,mailto:security@almalinux.org diff --git a/net/core/gro.c b/net/core/gro.c index 26a419e0ee..b5eab60e4f 100644 --- a/net/core/gro.c +++ b/net/core/gro.c @@ -108,6 +108,9 @@ int skb_gro_receive(struct sk_buff *p, struct sk_buff *skb) if (p->pp_recycle != skb->pp_recycle) return -ETOOMANYREFS; + if (skb_zcopy(p) || skb_zcopy(skb)) + return -ETOOMANYREFS; + if (unlikely(p->len + len >= netif_get_gro_max_size(p->dev, p) || NAPI_GRO_CB(skb)->flush)) return -E2BIG; diff --git a/redhat/kernel.changelog-10.2 b/redhat/kernel.changelog-10.2 index 7730a4a61e..6f2a73a22c 100644 --- a/redhat/kernel.changelog-10.2 +++ b/redhat/kernel.changelog-10.2 @@ -1,3 +1,7 @@ +* Wed Jul 22 2026 CKI KWF Bot [6.12.0-211.38.1.el10_2] +- net: gro: don't merge zcopy skbs (CKI Backport Bot) [RHEL-177856] {CVE-2026-46323} +Resolves: RHEL-177856 + * Tue Jul 21 2026 CKI KWF Bot [6.12.0-211.37.1.el10_2] - can: bcm: defer rx_op deallocation to workqueue to fix thrtimer UAF (CKI Backport Bot) [RHEL-212681] - fanotify: fix false positive on permission events (CKI Backport Bot) [RHEL-180076] {CVE-2026-46150} diff --git a/uki-addons.sbat b/uki-addons.sbat index 2a69443b7e..d916827fca 100644 --- a/uki-addons.sbat +++ b/uki-addons.sbat @@ -1,2 +1,2 @@ sbat,1,SBAT Version,sbat,1,https://github.com/rhboot/shim/blob/main/SBAT.md -kernel-uki-virt-addons.almalinux,1,AlmaLinux,kernel-uki-virt-addons,6.12.0-211.37.1.el10.x86_64,mailto:security@almalinux.org +kernel-uki-virt-addons.almalinux,1,AlmaLinux,kernel-uki-virt-addons,6.12.0-211.38.1.el10.x86_64,mailto:security@almalinux.org diff --git a/uki.sbat b/uki.sbat index 5bedb947cf..6b3d8d31ba 100644 --- a/uki.sbat +++ b/uki.sbat @@ -1,2 +1,2 @@ sbat,1,SBAT Version,sbat,1,https://github.com/rhboot/shim/blob/main/SBAT.md -kernel-uki-virt.almalinux,1,AlmaLinux,kernel-uki-virt,6.12.0-211.37.1.el10.x86_64,mailto:security@almalinux.org +kernel-uki-virt.almalinux,1,AlmaLinux,kernel-uki-virt,6.12.0-211.38.1.el10.x86_64,mailto:security@almalinux.org