diff --git a/.gitignore b/.gitignore index 4577be970..b75fd6390 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,6 @@ -fedoraimaca.x509 -kernel-abi-stablelists-6.12.0-124.39.1.el10_1.tar.xz -kernel-kabi-dw-6.12.0-124.39.1.el10_1.tar.xz -linux-6.12.0-124.39.1.el10_1.tar.xz +kernel-abi-stablelists-6.12.0-124.40.1.el10_1.tar.xz +kernel-kabi-dw-6.12.0-124.40.1.el10_1.tar.xz +linux-6.12.0-124.40.1.el10_1.tar.xz nvidiagpuoot001.x509 olima1.x509 olimaca1.x509 diff --git a/Makefile.rhelver b/Makefile.rhelver index 49caf47c9..1b4d49c32 100644 --- a/Makefile.rhelver +++ b/Makefile.rhelver @@ -12,7 +12,7 @@ RHEL_MINOR = 1 # # Use this spot to avoid future merge conflicts. # Do not trim this comment. -RHEL_RELEASE = 124.39.1 +RHEL_RELEASE = 124.40.1 # # RHEL_REBASE_NUM diff --git a/def_variants.yaml.rhel b/def_variants.yaml.rhel index a6906dd44..11ee2fcf2 100644 --- a/def_variants.yaml.rhel +++ b/def_variants.yaml.rhel @@ -436,6 +436,7 @@ rules: - net/dns_resolver/.*: modules-core - net/hsr/.*: modules-core - net/ife/.*: modules-core + - net/ipv4/fou.ko: modules-extra - net/ipv4/netfilter/arp.*: modules-extra - net/ipv4/netfilter/ip[_t].*: modules-extra - net/ipv4/tcp_bic.*: modules-extra @@ -450,6 +451,7 @@ rules: - net/ipv4/tcp_westwood.*: modules-extra - net/ipv4/tcp_yeah.*: modules-extra - net/ipv4/.*: modules-core + - net/ipv6/fou6.ko: modules-extra - net/ipv6/netfilter/ebt.*: modules-extra - net/ipv6/netfilter/ip6[_t].*: modules-extra - net/ipv6/.*: modules-core diff --git a/kernel-aarch64-64k-debug-rhel.config b/kernel-aarch64-64k-debug-rhel.config index 8102a7453..7fa3b6748 100644 --- a/kernel-aarch64-64k-debug-rhel.config +++ b/kernel-aarch64-64k-debug-rhel.config @@ -4394,8 +4394,8 @@ CONFIG_NETFILTER_XT_TARGET_TPROXY=m CONFIG_NETFILTER_XT_TARGET_TRACE=m CONFIG_NETFILTER=y CONFIG_NET_FLOW_LIMIT=y -# CONFIG_NET_FOU_IP_TUNNELS is not set -# CONFIG_NET_FOU is not set +CONFIG_NET_FOU_IP_TUNNELS=y +CONFIG_NET_FOU=m # CONFIG_NETFS_DEBUG is not set CONFIG_NETFS_STATS=y CONFIG_NETFS_SUPPORT=m diff --git a/kernel-aarch64-64k-rhel.config b/kernel-aarch64-64k-rhel.config index 624af6647..ed7fd847d 100644 --- a/kernel-aarch64-64k-rhel.config +++ b/kernel-aarch64-64k-rhel.config @@ -4373,8 +4373,8 @@ CONFIG_NETFILTER_XT_TARGET_TPROXY=m CONFIG_NETFILTER_XT_TARGET_TRACE=m CONFIG_NETFILTER=y CONFIG_NET_FLOW_LIMIT=y -# CONFIG_NET_FOU_IP_TUNNELS is not set -# CONFIG_NET_FOU is not set +CONFIG_NET_FOU_IP_TUNNELS=y +CONFIG_NET_FOU=m # CONFIG_NETFS_DEBUG is not set CONFIG_NETFS_STATS=y CONFIG_NETFS_SUPPORT=m diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config index 26f6efa03..8dfb9ab94 100644 --- a/kernel-aarch64-debug-rhel.config +++ b/kernel-aarch64-debug-rhel.config @@ -4391,8 +4391,8 @@ CONFIG_NETFILTER_XT_TARGET_TPROXY=m CONFIG_NETFILTER_XT_TARGET_TRACE=m CONFIG_NETFILTER=y CONFIG_NET_FLOW_LIMIT=y -# CONFIG_NET_FOU_IP_TUNNELS is not set -# CONFIG_NET_FOU is not set +CONFIG_NET_FOU_IP_TUNNELS=y +CONFIG_NET_FOU=m # CONFIG_NETFS_DEBUG is not set CONFIG_NETFS_STATS=y CONFIG_NETFS_SUPPORT=m diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config index 98d952eee..392afdc4f 100644 --- a/kernel-aarch64-rhel.config +++ b/kernel-aarch64-rhel.config @@ -4370,8 +4370,8 @@ CONFIG_NETFILTER_XT_TARGET_TPROXY=m CONFIG_NETFILTER_XT_TARGET_TRACE=m CONFIG_NETFILTER=y CONFIG_NET_FLOW_LIMIT=y -# CONFIG_NET_FOU_IP_TUNNELS is not set -# CONFIG_NET_FOU is not set +CONFIG_NET_FOU_IP_TUNNELS=y +CONFIG_NET_FOU=m # CONFIG_NETFS_DEBUG is not set CONFIG_NETFS_STATS=y CONFIG_NETFS_SUPPORT=m diff --git a/kernel-aarch64-rt-64k-debug-rhel.config b/kernel-aarch64-rt-64k-debug-rhel.config index ee576390d..cdb3656b7 100644 --- a/kernel-aarch64-rt-64k-debug-rhel.config +++ b/kernel-aarch64-rt-64k-debug-rhel.config @@ -4435,8 +4435,8 @@ CONFIG_NETFILTER_XT_TARGET_TPROXY=m CONFIG_NETFILTER_XT_TARGET_TRACE=m CONFIG_NETFILTER=y CONFIG_NET_FLOW_LIMIT=y -# CONFIG_NET_FOU_IP_TUNNELS is not set -# CONFIG_NET_FOU is not set +CONFIG_NET_FOU_IP_TUNNELS=y +CONFIG_NET_FOU=m # CONFIG_NETFS_DEBUG is not set CONFIG_NETFS_STATS=y CONFIG_NETFS_SUPPORT=m diff --git a/kernel-aarch64-rt-64k-rhel.config b/kernel-aarch64-rt-64k-rhel.config index 98bf11bc2..014fa4675 100644 --- a/kernel-aarch64-rt-64k-rhel.config +++ b/kernel-aarch64-rt-64k-rhel.config @@ -4414,8 +4414,8 @@ CONFIG_NETFILTER_XT_TARGET_TPROXY=m CONFIG_NETFILTER_XT_TARGET_TRACE=m CONFIG_NETFILTER=y CONFIG_NET_FLOW_LIMIT=y -# CONFIG_NET_FOU_IP_TUNNELS is not set -# CONFIG_NET_FOU is not set +CONFIG_NET_FOU_IP_TUNNELS=y +CONFIG_NET_FOU=m # CONFIG_NETFS_DEBUG is not set CONFIG_NETFS_STATS=y CONFIG_NETFS_SUPPORT=m diff --git a/kernel-aarch64-rt-debug-rhel.config b/kernel-aarch64-rt-debug-rhel.config index fe7be237e..248fb9561 100644 --- a/kernel-aarch64-rt-debug-rhel.config +++ b/kernel-aarch64-rt-debug-rhel.config @@ -4432,8 +4432,8 @@ CONFIG_NETFILTER_XT_TARGET_TPROXY=m CONFIG_NETFILTER_XT_TARGET_TRACE=m CONFIG_NETFILTER=y CONFIG_NET_FLOW_LIMIT=y -# CONFIG_NET_FOU_IP_TUNNELS is not set -# CONFIG_NET_FOU is not set +CONFIG_NET_FOU_IP_TUNNELS=y +CONFIG_NET_FOU=m # CONFIG_NETFS_DEBUG is not set CONFIG_NETFS_STATS=y CONFIG_NETFS_SUPPORT=m diff --git a/kernel-aarch64-rt-rhel.config b/kernel-aarch64-rt-rhel.config index 02ed4abae..e7fd45738 100644 --- a/kernel-aarch64-rt-rhel.config +++ b/kernel-aarch64-rt-rhel.config @@ -4411,8 +4411,8 @@ CONFIG_NETFILTER_XT_TARGET_TPROXY=m CONFIG_NETFILTER_XT_TARGET_TRACE=m CONFIG_NETFILTER=y CONFIG_NET_FLOW_LIMIT=y -# CONFIG_NET_FOU_IP_TUNNELS is not set -# CONFIG_NET_FOU is not set +CONFIG_NET_FOU_IP_TUNNELS=y +CONFIG_NET_FOU=m # CONFIG_NETFS_DEBUG is not set CONFIG_NETFS_STATS=y CONFIG_NETFS_SUPPORT=m diff --git a/kernel-ppc64le-debug-rhel.config b/kernel-ppc64le-debug-rhel.config index ee08f1b91..fe6e7c198 100644 --- a/kernel-ppc64le-debug-rhel.config +++ b/kernel-ppc64le-debug-rhel.config @@ -4021,8 +4021,8 @@ CONFIG_NETFILTER_XT_TARGET_TPROXY=m CONFIG_NETFILTER_XT_TARGET_TRACE=m CONFIG_NETFILTER=y CONFIG_NET_FLOW_LIMIT=y -# CONFIG_NET_FOU_IP_TUNNELS is not set -# CONFIG_NET_FOU is not set +CONFIG_NET_FOU_IP_TUNNELS=y +CONFIG_NET_FOU=m # CONFIG_NETFS_DEBUG is not set CONFIG_NETFS_STATS=y CONFIG_NETFS_SUPPORT=m diff --git a/kernel-ppc64le-rhel.config b/kernel-ppc64le-rhel.config index 0e621e548..39da53707 100644 --- a/kernel-ppc64le-rhel.config +++ b/kernel-ppc64le-rhel.config @@ -4001,8 +4001,8 @@ CONFIG_NETFILTER_XT_TARGET_TPROXY=m CONFIG_NETFILTER_XT_TARGET_TRACE=m CONFIG_NETFILTER=y CONFIG_NET_FLOW_LIMIT=y -# CONFIG_NET_FOU_IP_TUNNELS is not set -# CONFIG_NET_FOU is not set +CONFIG_NET_FOU_IP_TUNNELS=y +CONFIG_NET_FOU=m # CONFIG_NETFS_DEBUG is not set CONFIG_NETFS_STATS=y CONFIG_NETFS_SUPPORT=m diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config index 137279909..825ba1990 100644 --- a/kernel-s390x-debug-rhel.config +++ b/kernel-s390x-debug-rhel.config @@ -3999,8 +3999,8 @@ CONFIG_NETFILTER_XT_TARGET_TPROXY=m CONFIG_NETFILTER_XT_TARGET_TRACE=m CONFIG_NETFILTER=y CONFIG_NET_FLOW_LIMIT=y -# CONFIG_NET_FOU_IP_TUNNELS is not set -# CONFIG_NET_FOU is not set +CONFIG_NET_FOU_IP_TUNNELS=y +CONFIG_NET_FOU=m # CONFIG_NETFS_DEBUG is not set CONFIG_NETFS_STATS=y CONFIG_NETFS_SUPPORT=m diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config index 24050a653..5aa721c18 100644 --- a/kernel-s390x-rhel.config +++ b/kernel-s390x-rhel.config @@ -3979,8 +3979,8 @@ CONFIG_NETFILTER_XT_TARGET_TPROXY=m CONFIG_NETFILTER_XT_TARGET_TRACE=m CONFIG_NETFILTER=y CONFIG_NET_FLOW_LIMIT=y -# CONFIG_NET_FOU_IP_TUNNELS is not set -# CONFIG_NET_FOU is not set +CONFIG_NET_FOU_IP_TUNNELS=y +CONFIG_NET_FOU=m # CONFIG_NETFS_DEBUG is not set CONFIG_NETFS_STATS=y CONFIG_NETFS_SUPPORT=m diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config index 77787d89b..2b901c85c 100644 --- a/kernel-s390x-zfcpdump-rhel.config +++ b/kernel-s390x-zfcpdump-rhel.config @@ -3988,8 +3988,8 @@ CONFIG_NETFILTER_XT_TARGET_TEE=m CONFIG_NETFILTER_XT_TARGET_TPROXY=m CONFIG_NETFILTER_XT_TARGET_TRACE=m CONFIG_NET_FLOW_LIMIT=y -# CONFIG_NET_FOU_IP_TUNNELS is not set -# CONFIG_NET_FOU is not set +CONFIG_NET_FOU_IP_TUNNELS=y +CONFIG_NET_FOU=m # CONFIG_NETFS_DEBUG is not set CONFIG_NETFS_STATS=y # CONFIG_NETFS_SUPPORT is not set diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config index bd2b7d10a..df49d905a 100644 --- a/kernel-x86_64-debug-rhel.config +++ b/kernel-x86_64-debug-rhel.config @@ -4291,8 +4291,8 @@ CONFIG_NETFILTER_XT_TARGET_TPROXY=m CONFIG_NETFILTER_XT_TARGET_TRACE=m CONFIG_NETFILTER=y CONFIG_NET_FLOW_LIMIT=y -# CONFIG_NET_FOU_IP_TUNNELS is not set -# CONFIG_NET_FOU is not set +CONFIG_NET_FOU_IP_TUNNELS=y +CONFIG_NET_FOU=m # CONFIG_NETFS_DEBUG is not set CONFIG_NETFS_STATS=y CONFIG_NETFS_SUPPORT=m diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config index 30a71006a..906a0248b 100644 --- a/kernel-x86_64-rhel.config +++ b/kernel-x86_64-rhel.config @@ -4271,8 +4271,8 @@ CONFIG_NETFILTER_XT_TARGET_TPROXY=m CONFIG_NETFILTER_XT_TARGET_TRACE=m CONFIG_NETFILTER=y CONFIG_NET_FLOW_LIMIT=y -# CONFIG_NET_FOU_IP_TUNNELS is not set -# CONFIG_NET_FOU is not set +CONFIG_NET_FOU_IP_TUNNELS=y +CONFIG_NET_FOU=m # CONFIG_NETFS_DEBUG is not set CONFIG_NETFS_STATS=y CONFIG_NETFS_SUPPORT=m diff --git a/kernel-x86_64-rt-debug-rhel.config b/kernel-x86_64-rt-debug-rhel.config index 46b79632c..76e7883e5 100644 --- a/kernel-x86_64-rt-debug-rhel.config +++ b/kernel-x86_64-rt-debug-rhel.config @@ -4332,8 +4332,8 @@ CONFIG_NETFILTER_XT_TARGET_TPROXY=m CONFIG_NETFILTER_XT_TARGET_TRACE=m CONFIG_NETFILTER=y CONFIG_NET_FLOW_LIMIT=y -# CONFIG_NET_FOU_IP_TUNNELS is not set -# CONFIG_NET_FOU is not set +CONFIG_NET_FOU_IP_TUNNELS=y +CONFIG_NET_FOU=m # CONFIG_NETFS_DEBUG is not set CONFIG_NETFS_STATS=y CONFIG_NETFS_SUPPORT=m diff --git a/kernel-x86_64-rt-rhel.config b/kernel-x86_64-rt-rhel.config index 47e2c83df..99edf5af2 100644 --- a/kernel-x86_64-rt-rhel.config +++ b/kernel-x86_64-rt-rhel.config @@ -4312,8 +4312,8 @@ CONFIG_NETFILTER_XT_TARGET_TPROXY=m CONFIG_NETFILTER_XT_TARGET_TRACE=m CONFIG_NETFILTER=y CONFIG_NET_FLOW_LIMIT=y -# CONFIG_NET_FOU_IP_TUNNELS is not set -# CONFIG_NET_FOU is not set +CONFIG_NET_FOU_IP_TUNNELS=y +CONFIG_NET_FOU=m # CONFIG_NETFS_DEBUG is not set CONFIG_NETFS_STATS=y CONFIG_NETFS_SUPPORT=m diff --git a/kernel.changelog b/kernel.changelog index 5cd136764..297383dc1 100644 --- a/kernel.changelog +++ b/kernel.changelog @@ -1,3 +1,20 @@ +* Thu Feb 19 2026 CKI KWF Bot [6.12.0-124.40.1.el10_1] +- s390/mm: Fix __ptep_rdp() inline assembly (Mete Durlu) [RHEL-143715] +- ice: PTP: fix missing timestamps on E825 hardware (CKI Backport Bot) [RHEL-148168] +- fou: Don't allow 0 for FOU_ATTR_IPPROTO. (Xin Long) [RHEL-144984] +- tools: ynl: Specify --no-line-number in ynl-regen.sh. (Xin Long) [RHEL-144984] +- gue: Fix skb memleak with inner IP protocol 0. (Xin Long) [RHEL-144984] +- netlink: specs: fou: replace underscores with dashes in names (Xin Long) [RHEL-144984] +- redhat: enable FOU modules in kernel-modules-extra (Xin Long) [RHEL-144984] +- net/smc: Remove validation of reserved bits in CLC Decline message (CKI Backport Bot) [RHEL-143717] +- scsi: s390: zfcp: Ensure synchronous unit_add (CKI Backport Bot) [RHEL-143733] +- smb: client: Add tracepoint for krb5 auth (Paulo Alcantara) [RHEL-145511] +- smb: client: improve error message when creating SMB session (Paulo Alcantara) [RHEL-145511] +- smb: client: relax session and tcon reconnect attempts (Paulo Alcantara) [RHEL-145511] +- cifs: #include cifsglob.h before trace.h to allow structs in tracepoints (Paulo Alcantara) [RHEL-145511] +- ALSA: hda/realtek - Enable Mute LED for Lenovo platform (Jaroslav Kysela) [RHEL-141440] +Resolves: RHEL-141440, RHEL-143715, RHEL-143717, RHEL-143733, RHEL-144984, RHEL-145511, RHEL-148168 + * Tue Feb 17 2026 CKI KWF Bot [6.12.0-124.39.1.el10_1] - exfat: fix double free in delayed_free (CKI Backport Bot) [RHEL-146406] {CVE-2025-38206} - mlxsw: spectrum_mr: Fix use-after-free when updating multicast route stats (CKI Backport Bot) [RHEL-143196] {CVE-2025-68800} diff --git a/kernel.spec b/kernel.spec index f79399504..5a08eb8d5 100644 --- a/kernel.spec +++ b/kernel.spec @@ -98,7 +98,7 @@ Summary: The Linux kernel %if 0%{?fedora} %define secure_boot_arch x86_64 %else -%define secure_boot_arch x86_64 aarch64 s390x ppc64le +%define secure_boot_arch x86_64 s390x ppc64le %endif # Signing for secure boot authentication @@ -176,15 +176,15 @@ Summary: The Linux kernel %define specrpmversion 6.12.0 %define specversion 6.12.0 %define patchversion 6.12 -%define pkgrelease 124.39.1 +%define pkgrelease 124.40.1 %define kversion 6 -%define tarfile_release 6.12.0-124.39.1.el10_1 +%define tarfile_release 6.12.0-124.40.1.el10_1 # This is needed to do merge window version magic %define patchlevel 12 # This allows pkg_release to have configurable %%{?dist} tag -%define specrelease 124.39.1%{?buildid}%{?dist} +%define specrelease 124.40.1%{?buildid}%{?dist} # This defines the kabi tarball version -%define kabiversion 6.12.0-124.39.1.el10_1 +%define kabiversion 6.12.0-124.40.1.el10_1 # If this variable is set to 1, a bpf selftests build failure will cause a # fatal kernel package build error @@ -717,6 +717,8 @@ Requires: ((%{name}-modules-extra-uname-r = %{KVERREL}) if %{name}-modules-extra Provides: installonlypkg(kernel) %endif +Provides: oracle(kernel-sig-key) == 202502 +Conflicts: shim-x64 < 15.8-1.0.6 # # List the packages used during the kernel build @@ -881,8 +883,6 @@ BuildRequires: tpm2-tools %if 0%{?rhel}%{?centos} && !0%{?eln} %if 0%{?centos} BuildRequires: centos-sb-certs >= 9.0-23 -%else -BuildRequires: redhat-sb-certs >= 9.4-0.1 %endif %endif %endif @@ -902,42 +902,11 @@ Source10: redhatsecurebootca5.cer Source13: redhatsecureboot501.cer %if %{signkernel} -# Name of the packaged file containing signing key -%ifarch ppc64le -%define signing_key_filename kernel-signing-ppc.cer -%endif -%ifarch s390x -%define signing_key_filename kernel-signing-s390.cer -%endif -# Fedora/ELN pesign macro expects to see these cert file names, see: -# https://github.com/rhboot/pesign/blob/main/src/pesign-rpmbuild-helper.in#L216 -%if 0%{?fedora}%{?eln} -%define pesign_name_0 redhatsecureboot501 -%define secureboot_ca_0 %{SOURCE10} -%define secureboot_key_0 %{SOURCE13} -%endif - -# RHEL/centos certs come from system-sb-certs -%if 0%{?rhel} && !0%{?eln} %define secureboot_ca_0 %{_datadir}/pki/sb-certs/secureboot-ca-%{_arch}.cer %define secureboot_key_0 %{_datadir}/pki/sb-certs/secureboot-kernel-%{_arch}.cer -%if 0%{?centos} -%define pesign_name_0 centossecureboot201 -%else -%ifarch x86_64 aarch64 -%define pesign_name_0 redhatsecureboot801 -%endif -%ifarch s390x -%define pesign_name_0 redhatsecureboot302 -%endif -%ifarch ppc64le -%define pesign_name_0 redhatsecureboot701 -%endif -%endif -# rhel && !eln -%endif +%define pesign_name_0 OracleLinuxSecureBootKey3 # signkernel %endif @@ -1018,7 +987,10 @@ Source102: nvidiagpuoot001.x509 Source103: rhelimaca1.x509 Source104: rhelima.x509 Source105: rhelima_centos.x509 -Source106: fedoraimaca.x509 +# Oracle Linux IMA CA certificate +Source106: olimaca1.x509 +# Oracle Linux IMA signing certificate +Source107: olima1.x509 %if 0%{?fedora}%{?eln} %define ima_ca_cert %{SOURCE106} @@ -1033,9 +1005,11 @@ Source106: fedoraimaca.x509 %define ima_signing_cert %{SOURCE105} %else %define ima_signing_cert %{SOURCE104} +%define ima_signing_cert_ol %{SOURCE107} %endif %define ima_cert_name ima.cer +%define ima_cert_name_ol ima_ol.cer Source200: check-kabi @@ -1106,6 +1080,10 @@ Source4000: README.rst Source4001: rpminspect.yaml Source4002: gating.yaml +# Oracle Linux RHCK Module Signing Key +Source5001: olkmod_signing_key.pem +Source5002: olkmod_signing_key1.pem + ## Patches needed for building this package %if !%{nopatches} @@ -1953,6 +1931,8 @@ ApplyOptionalPatch() mv linux-%{tarfile_release} linux-%{KVERREL} cd linux-%{KVERREL} +#removal of git history +rm -rf .git cp -a %{SOURCE1} . %{log_msg "Start of patch applications"} @@ -2079,6 +2059,13 @@ openssl x509 -inform der -in %{SOURCE100} -out rheldup3.pem openssl x509 -inform der -in %{SOURCE101} -out rhelkpatch1.pem openssl x509 -inform der -in %{SOURCE102} -out nvidiagpuoot001.pem cat rheldup3.pem rhelkpatch1.pem nvidiagpuoot001.pem >> ../certs/rhel.pem +# Add Oracle Linux IMA CA certificate to the kernel trusted certificates list +openssl x509 -inform der -in %{SOURCE106} -out olimaca1.pem +cat olimaca1.pem >> ../certs/rhel.pem +# Add olkmod_signing_key.pem to the kernel trusted certificates list +cat %{SOURCE5001} >> ../certs/rhel.pem +# Add olkmod_signing_key1.pem to the kernel trusted certificates list +cat %{SOURCE5002} >> ../certs/rhel.pem # rhelkeys %endif %if %{signkernel} @@ -2103,7 +2090,7 @@ done %if 0%{?rhel} %{log_msg "Adjust FIPS module name for RHEL"} for i in *.config; do - sed -i 's/CONFIG_CRYPTO_FIPS_NAME=.*/CONFIG_CRYPTO_FIPS_NAME="Red Hat Enterprise Linux %{rhel} - Kernel Cryptographic API"/' $i + sed -i 's/CONFIG_CRYPTO_FIPS_NAME=.*/CONFIG_CRYPTO_FIPS_NAME="Oracle Linux 10 Kernel Crypto API Cryptographic Module"/' $i done %endif @@ -2756,6 +2743,22 @@ BuildKernel() { SBATsuffix="rhel" %endif %endif + SBAT=$(cat <<- EOF + linux,1,Red Hat,linux,$KernelVer,mailto:secalert@redhat.com + linux,1,Oracle Linux,linux,$KernelVer,mailto:secalert_us@oracle.com + linux.$SBATsuffix,1,Red Hat,linux,$KernelVer,mailto:secalert@redhat.com + linux.ol,1,Oracle Linux,linux,$KernelVer,mailto:secalert_us@oracle.com + kernel-uki-virt.$SBATsuffix,1,Red Hat,kernel-uki-virt,$KernelVer,mailto:secalert@redhat.com + kernel-uki-virt.ol,1,Oracle Linux,kernel-uki-virt,$KernelVer,mailto:secalert_us@oracle.com + EOF + ) + + ADDONS_SBAT=$(cat <<- EOF + sbat,1,SBAT Version,sbat,1,https://github.com/rhboot/shim/blob/main/SBAT.md + kernel-uki-virt-addons.$SBATsuffix,1,Red Hat,kernel-uki-virt-addons,$KernelVer,mailto:secalert@redhat.com + EOF + ) + KernelUnifiedImageDir="$RPM_BUILD_ROOT/lib/modules/$KernelVer" KernelUnifiedImage="$KernelUnifiedImageDir/$InstallName-virt.efi" KernelUnifiedInitrd="$KernelUnifiedImageDir/$InstallName-virt.img" @@ -2782,6 +2785,7 @@ BuildKernel() { python3 %{SOURCE151} %{SOURCE152} $KernelAddonsDirOut virt %{primary_target} %{_target_cpu} @uki-addons.sbat %if %{signkernel} +%if ! %{?oraclelinux} %{log_msg "Sign the EFI UKI kernel"} %if 0%{?fedora}%{?eln} %pesign -s -i $KernelUnifiedImage -o $KernelUnifiedImage.signed -a %{secureboot_ca_0} -c %{secureboot_key_0} -n %{pesign_name_0} @@ -2813,6 +2817,7 @@ BuildKernel() { cp -a $UKI_secureboot_cert $RPM_BUILD_ROOT%{_datadir}/doc/kernel-keys/$KernelVer/secureboot-uki-%{_arch}.cer # signkernel +%endif %endif # hmac sign the UKI for FIPS @@ -2979,7 +2984,7 @@ BuildKernel() { # prune junk from kernel-debuginfo find $RPM_BUILD_ROOT/usr/src/kernels -name "*.mod.c" -delete - # Red Hat UEFI Secure Boot CA cert, which can be used to authenticate the kernel + # UEFI Secure Boot CA cert, which can be used to authenticate the kernel %{log_msg "Install certs"} mkdir -p $RPM_BUILD_ROOT%{_datadir}/doc/kernel-keys/$KernelVer %if %{signkernel} @@ -2994,6 +2999,8 @@ BuildKernel() { %if 0%{?rhel} # Red Hat IMA code-signing cert, which is used to authenticate package files install -m 0644 %{ima_signing_cert} $RPM_BUILD_ROOT%{_datadir}/doc/kernel-keys/$KernelVer/%{ima_cert_name} + # Oracle Linux IMA signing cert + install -m 0644 %{ima_signing_cert_ol} $RPM_BUILD_ROOT%{_datadir}/doc/kernel-keys/$KernelVer/%{ima_cert_name_ol} %endif %if %{signmodules} @@ -4349,6 +4356,35 @@ fi\ # # %changelog +* Mon Mar 02 2026 EL Errata [6.12.0-124.40.1.el10_1.OL10] +- Add new Oracle Linux Driver Signing (key 1) certificate [Orabug: 37985782] +- Disable UKI signing [Orabug: 36571828] +- Update Oracle Linux certificates (Kevin Lyons) +- Disable signing for aarch64 (Ilya Okomin) +- Oracle Linux RHCK Module Signing Key was added to the kernel trusted keys list (olkmod_signing_key.pem) [Orabug: 29539237] +- Update x509.genkey [Orabug: 24817676] +- Conflict with shim-ia32 and shim-x64 <= 15.3-1.0.5.el9 +- Remove upstream reference during boot (Kevin Lyons) [Orabug: 34729535] +- Add Oracle Linux IMA certificates +- Update module name for cryptographic module [Orabug: 37400433] +- Clean git history at setup stage + +* Thu Feb 19 2026 CKI KWF Bot [6.12.0-124.40.1.el10_1] +- s390/mm: Fix __ptep_rdp() inline assembly (Mete Durlu) [RHEL-143715] +- ice: PTP: fix missing timestamps on E825 hardware (CKI Backport Bot) [RHEL-148168] +- fou: Don't allow 0 for FOU_ATTR_IPPROTO. (Xin Long) [RHEL-144984] +- tools: ynl: Specify --no-line-number in ynl-regen.sh. (Xin Long) [RHEL-144984] +- gue: Fix skb memleak with inner IP protocol 0. (Xin Long) [RHEL-144984] +- netlink: specs: fou: replace underscores with dashes in names (Xin Long) [RHEL-144984] +- redhat: enable FOU modules in kernel-modules-extra (Xin Long) [RHEL-144984] +- net/smc: Remove validation of reserved bits in CLC Decline message (CKI Backport Bot) [RHEL-143717] +- scsi: s390: zfcp: Ensure synchronous unit_add (CKI Backport Bot) [RHEL-143733] +- smb: client: Add tracepoint for krb5 auth (Paulo Alcantara) [RHEL-145511] +- smb: client: improve error message when creating SMB session (Paulo Alcantara) [RHEL-145511] +- smb: client: relax session and tcon reconnect attempts (Paulo Alcantara) [RHEL-145511] +- cifs: #include cifsglob.h before trace.h to allow structs in tracepoints (Paulo Alcantara) [RHEL-145511] +- ALSA: hda/realtek - Enable Mute LED for Lenovo platform (Jaroslav Kysela) [RHEL-141440] + * Tue Feb 17 2026 CKI KWF Bot [6.12.0-124.39.1.el10_1] - exfat: fix double free in delayed_free (CKI Backport Bot) [RHEL-146406] {CVE-2025-38206} - mlxsw: spectrum_mr: Fix use-after-free when updating multicast route stats (CKI Backport Bot) [RHEL-143196] {CVE-2025-68800} diff --git a/olkmod_signing_key.pem b/olkmod_signing_key.pem new file mode 100644 index 000000000..7a51daf16 --- /dev/null +++ b/olkmod_signing_key.pem @@ -0,0 +1,24 @@ +-----BEGIN CERTIFICATE----- +MIIEETCCAvmgAwIBAgIJANw8y5k9b7SaMA0GCSqGSIb3DQEBCwUAMIGeMQswCQYD +VQQGEwJVUzETMBEGA1UECAwKQ2FsaWZvcm5pYTEXMBUGA1UEBwwOUmVkd29vZCBT +aG9yZXMxGzAZBgNVBAoMEk9yYWNsZSBDb3Jwb3JhdGlvbjEVMBMGA1UECwwMT3Jh +Y2xlIExpbnV4MS0wKwYDVQQDDCRPcmFjbGUgTGludXggUkhDSyBNb2R1bGUgU2ln +bmluZyBLZXkwHhcNMTYwNTA5MjMzNjA4WhcNMjYwNTA3MjMzNjA4WjCBnjELMAkG +A1UEBhMCVVMxEzARBgNVBAgMCkNhbGlmb3JuaWExFzAVBgNVBAcMDlJlZHdvb2Qg +U2hvcmVzMRswGQYDVQQKDBJPcmFjbGUgQ29ycG9yYXRpb24xFTATBgNVBAsMDE9y +YWNsZSBMaW51eDEtMCsGA1UEAwwkT3JhY2xlIExpbnV4IFJIQ0sgTW9kdWxlIFNp +Z25pbmcgS2V5MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAl6bUDNNZ +jIqgsqgspwBIQ18keDxQeGnWgubZZhHrQU3GpeSRPM4lNTHc+UjMjNXrv/CENZdv +4cETRsxT1VFhGG3CvkbQdzc8v4JOQvWSSJqmViPa1eC+yGaMRnGcFXzKsHiTLA4y +WMjpJnVowFkwTzscRBlN0AysUg/hT/74DE0oqVnlCJNynqccNWpx8MtNRD55ay9A +73yJinYES14rXcU3QbJoO0ZxtRz83ZACDUGX0GORT3+NbB0RK0sttogzA3eLvxKw +umWsWZAHmTuHdWgUjSqqZr34VNLPVcsTHAW8X4bq6rRVcB2lMJ3kJfDP8BJyTn99 +37UmA+/ld47cnwIDAQABo1AwTjAdBgNVHQ4EFgQU3ZlbFVwZs6fD73cHuWniX5Y5 +Zm4wHwYDVR0jBBgwFoAU3ZlbFVwZs6fD73cHuWniX5Y5Zm4wDAYDVR0TBAUwAwEB +/zANBgkqhkiG9w0BAQsFAAOCAQEAF7nfhWfsk4uEDquLj7nJE0wPlVvllVDugzOk +R15pnQ7P+HTyz3sLaLJE4N5oWt6pFzDGDYEtPeoMCn1l447tX179Nf5SMZba9ut8 +3Vxbe7jAn9sQO7ArQR1swf1r101Me4+1oHq7rxPRizOOXrKeEvf5NSAUbSzzXfz6 +TEp21KTIQO7MjqpsKshRQbpPeiReaYy3A6gJftun5xekP04QTLZVBR4dL7tvZf0S +y9SjVg158lONXHfjBekyYTzSFBn/7v+AS8S+cAGRfYteE0Syxl7zJt3GUoEWau/e +kXHT+hd/hkdSQKZZWZo1380M1pVZZAvntLRBU6IN9SswafhiVg== +-----END CERTIFICATE----- diff --git a/olkmod_signing_key1.pem b/olkmod_signing_key1.pem new file mode 100644 index 000000000..b99afba7a --- /dev/null +++ b/olkmod_signing_key1.pem @@ -0,0 +1,35 @@ +-----BEGIN CERTIFICATE----- +MIIGBjCCA+6gAwIBAgIUf99zHRXkhhuQepjkXdIfz1kNGiwwDQYJKoZIhvcNAQEL +BQAwgZ4xKTAnBgNVBAMMIE9yYWNsZSBMaW51eCBEcml2ZXIgU2lnbmluZyBDQSAx +MQswCQYDVQQGEwJ1czEVMBMGA1UEBwwMUmVkd29vZCBDaXR5MRswGQYDVQQKDBJP +cmFjbGUgQ29ycG9yYXRpb24xGzAZBgNVBAsMEk9yYWNsZSBDb3Jwb3JhdGlvbjET +MBEGA1UECAwKQ2FsaWZvcm5pYTAeFw0yNTA1MDIwOTIzNDFaFw0zNjA0MTIyMTEw +MjlaMGcxLDAqBgNVBAMMI09yYWNsZSBMaW51eCBEcml2ZXIgU2lnbmluZyAoa2V5 +IDEpMQswCQYDVQQGEwJ1czEVMBMGA1UEBwwMUmVkd29vZCBDaXR5MRMwEQYDVQQI +DApDYWxpZm9ybmlhMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA5dMQ +z4EwgCYLrxJCYTn0H5yncdJREDgAgkne3nQAmtJjfcoKNqRxieK5j1KjloF3Qvjt +c5gITvjpne1UrHTodPF9qpJrFieDPb9+CMUGg/R/gk20PofKa5+DhTMyeIEpBOa7 +P6/OdCGiwaGI85Js6JMnNX2YKerehKB44zVfiNmddn7T/3y2QFFNj3VH62tC4XNt +wZLCHnnO0JzOcZht5KA1JsITSLkT6/o//SZLpaNSAQkkanymdvszV5b0PDu4A0Fi +5Ch41Akset2kAlpRoRBaVVdNhqKDyzsGRFyzHD57EyyY4M6H3yh2T6SPPOTUOKgn +tcBfnFuijl2K/d87cnky1v1XzrvZqLzRz11ksLmZrUHZZ3PWfq2EndG8OiO4PdcF +sF4nd20yuUywW4nj5iZT5h6f8P06C62ILe+dJWNzpGm6JgyYvTnHoUXjoQR+TLs/ +WY1l1N2uf3lc5rkof4g+Ckh/6uI1k5XfyHIzw8Z9wEOliUvHXq/8TVZ653IMmfC8 +gIrIMNOXONMdG7ReTnsr9z7ckv/dYKbW1gWtyY8o92N3dLuYb8MpfvCHkVF5ItUR +52ay2wOQ1tDlfLUiU21yiglyW4rKanH6mrLd4mM8cphnPvRpZ9SM0qykwHrNqKOA +m9p0AwIf1zmUL6boX/Xd+6zM2HAXOPMS1EGjA6MCAwEAAaNyMHAwDAYDVR0TAQH/ +BAIwADALBgNVHQ8EBAMCB4AwEwYDVR0lBAwwCgYIKwYBBQUHAwMwHQYDVR0OBBYE +FDUwOWM0ZjZkYmZjMGUyODhjOGM4MB8GA1UdIwQYMBaAFGM2NDkzM2I4OWUzNTYw +ZmVhNWQzMA0GCSqGSIb3DQEBCwUAA4ICAQAmZbUs5P2HGRHt4W/QhGyfxxa/Go8K +6a1VZlh71OURsbQ42ZDCfrYgw8LtDPqx7ySlUlkjDcc7ZvRh6RzLyn+ARIohhKNH +PpEzIpOGm5P4zqY9R36STRSgCDl9iCNlk8pGKzqEIT+aCaZUWF+7NcFgePFDuN9W +FX5tXhxEqqn8rmvGMQ3ZtodxIJb6ksKz6j/JWnuvcD4EgI1ykyc8MAtIm2/qVmPQ +IofwXo6yL6ygT5K7cMsrte4EbzrHvuhuz89RHDmwmgB6XmZCWBOGYrO7lza2Yx0C +/m4LcUHPW6XgrtkvIcLST90Ng9fp8EQl7Rp3med0K83kdwKUt7Ju9aPze049tuTQ +QoHsIHDgsExK4wXUayHNgNNr8lMFm42gTB2DqP9F/Ihq7YhIdfXbOsVdS38Il9+Y +8RWI87H+0mAxsv2RnaNkEbmd+2vY9j1ebHyblN59mxDEY+h3W7v402ay01Ia2Lnw +szOAPq6AKZdfi0nan6zunurwEGKGeF4+Gr42RlA0Pcu1ZltBQVuMhvkO1wKZ5vO6 +MNR7swI0fH6VsyUms8wQbR85MCJg0MhpzRKw0g0Ka+c4nF1c4EmU4GaIbCNfzJy+ +68wdJDHhX+sbD7+AJBQ9i6TmtbPIGKNDHh9cMIXs+jMRtia/ZCYEsOOO5B+xrawF +JuZ4rgQv9ghmhQ== +-----END CERTIFICATE----- diff --git a/sources b/sources index 9aad9bb5c..c386bc24a 100644 --- a/sources +++ b/sources @@ -1,7 +1,6 @@ -SHA512 (fedoraimaca.x509) = e04809394f4472c17e86d7024dee34f03fb68e82a85502fd5b00535202c72e57626a8376b2cf991b7e1e46404aa5ab8d189ebf320e0dd37d49e7efbc925c7a2e -SHA512 (kernel-abi-stablelists-6.12.0-124.39.1.el10_1.tar.xz) = 2ca864e940ea064b618e48f7e95502e01b7cdcb1c8aee0b0c0b184eb0b238890f9b774da0b0f64c914a8459c2361eb94d916180070a61953c5e82441e316352e -SHA512 (kernel-kabi-dw-6.12.0-124.39.1.el10_1.tar.xz) = 1503aac6e90061e5ec34116cf7d61bcab8042af68240f47819c9aa11b50406cc2bd0e034c2b87e400bd18fdfd63cec41ea251bb53d47b8f56ba2303accfc57e0 -SHA512 (linux-6.12.0-124.39.1.el10_1.tar.xz) = 40f990062114790700a22eeda2d03a1ea365aebf652e2b7404bd93edd61c9b0f0a9dfdf25a19608458ce5bd11b9094e352afd50b15f4e63b891e40bacdb7201f +SHA512 (kernel-abi-stablelists-6.12.0-124.40.1.el10_1.tar.xz) = d38ae1f4fbc65de04993b390fc30e3d0886c3056cb12e7f473b532d51e71864c7a7dc93cae0acbde3947b91462773341146006ac9f2a68b933182fb69d75e9bf +SHA512 (kernel-kabi-dw-6.12.0-124.40.1.el10_1.tar.xz) = 44327a65368b4173457684126017f988dc09af51b8d558d1c9a98f9a9300bfe3f7c4be9985d6e9eb1f21a6b49e3b2f328a206df7671925fa00ccbccd7546ec5e +SHA512 (linux-6.12.0-124.40.1.el10_1.tar.xz) = 49193e3cb7c7a7f39f4e7bc986da6cee4f0e3c47d1f195e8e121bf76556b9490006cdfa8ef8bf732c5142ea3b96043007d101359c3b70d083e621c5477714631 SHA512 (nvidiagpuoot001.x509) = b42f836e1cfa07890cb6ca13de9c3950e306c9ec7686c4c09f050bb68869f5d82962b2cd5f3aa0eb7a0f3a3ae54e9c480eafbac5df53aa92c295ff511a8c59fe SHA512 (olima1.x509) = 123c26c1d698cc8523845c6e1103b9c72abf855acd225d37baf1f3388a47f912166d6d786fb367fe46de39e011b586ad7f3963aa2e8923da30a6ea9ae0d76ad3 SHA512 (olimaca1.x509) = 3a779415fad29d6f7250ec97ab1f0a5eb62c351b724feee06b22e17f065bf74a558f32cc524d3222c4485635ae5b9cd5287855c94010fe743b51a4d954340c4c diff --git a/x509.genkey.rhel b/x509.genkey.rhel index b1bbe387f..5b7056d65 100644 --- a/x509.genkey.rhel +++ b/x509.genkey.rhel @@ -5,9 +5,9 @@ prompt = no x509_extensions = myexts [ req_distinguished_name ] -O = Red Hat -CN = Red Hat Enterprise Linux kernel signing key -emailAddress = secalert@redhat.com +O = Oracle America, Inc.,c=US +CN = Oracle CA Server +emailAddress = support@oracle.com [ myexts ] basicConstraints=critical,CA:FALSE