diff --git a/.gitignore b/.gitignore index 725154b10..2dc6a4142 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,6 @@ -SOURCES/kernel-abi-stablelists-5.14.0-503.26.1.el9_5.tar.bz2 -SOURCES/kernel-kabi-dw-5.14.0-503.26.1.el9_5.tar.bz2 -SOURCES/linux-5.14.0-503.26.1.el9_5.tar.xz +SOURCES/kernel-abi-stablelists-5.14.0-503.29.1.el9_5.tar.bz2 +SOURCES/kernel-kabi-dw-5.14.0-503.29.1.el9_5.tar.bz2 +SOURCES/linux-5.14.0-503.29.1.el9_5.tar.xz SOURCES/nvidiagpuoot001.x509 SOURCES/olima1.x509 SOURCES/olimaca1.x509 diff --git a/.kernel.metadata b/.kernel.metadata index 326aa02da..4ce0b25f8 100644 --- a/.kernel.metadata +++ b/.kernel.metadata @@ -1,6 +1,6 @@ -debf9e108dcd2d01a4966b3e7d24363c57eac2e8 SOURCES/kernel-abi-stablelists-5.14.0-503.26.1.el9_5.tar.bz2 -5f02d452d42cbffc9e799a2cf401d1c1f21153f7 SOURCES/kernel-kabi-dw-5.14.0-503.26.1.el9_5.tar.bz2 -461cfa7e250ea403a3271d3ba631643ea77707b7 SOURCES/linux-5.14.0-503.26.1.el9_5.tar.xz +fdf5b4c85eff46c048ffe782328624dc87b5d67b SOURCES/kernel-abi-stablelists-5.14.0-503.29.1.el9_5.tar.bz2 +d5169e44060e7b6d3baf2e51d9d405739aa76c00 SOURCES/kernel-kabi-dw-5.14.0-503.29.1.el9_5.tar.bz2 +088b74fcb1ba5c4e388835abb7051abeeaa76732 SOURCES/linux-5.14.0-503.29.1.el9_5.tar.xz 4fff8080e88afffc06d8ef5004db8d53bb21237f SOURCES/nvidiagpuoot001.x509 706ae01dd14efa38f0f565a3706acac19c78df02 SOURCES/olima1.x509 6e3f0d61414c0b50f48dc2d4c3b3cd024e1c3a43 SOURCES/olimaca1.x509 diff --git a/SOURCES/1000-debrand-some-messages.patch b/SOURCES/1000-debrand-some-messages.patch new file mode 100644 index 000000000..d82ef0f3d --- /dev/null +++ b/SOURCES/1000-debrand-some-messages.patch @@ -0,0 +1,59 @@ +From 6ca79c451f7508fc1916113fd0cdba2140c14818 Mon Sep 17 00:00:00 2001 +From: Louis Abel +Date: Wed, 20 Sep 2023 14:16:05 -0700 +Subject: [PATCH] debrand some messages + +Modified-by: Alex Burmashev +--- + kernel/rh_shadowman.c | 55 ++++++++++++++++++++++--------------------- + 4 files changed, 34 insertions(+), 33 deletions(-) + +diff --git a/kernel/rh_shadowman.c b/kernel/rh_shadowman.c +index 018d5c633..d05ea0790 100644 +--- a/kernel/rh_shadowman.c ++++ b/kernel/rh_shadowman.c +@@ -1,39 +1 @@ +-#include +-#include +-#include +- +-/* Display a shadowman logo on the console screen */ +-static int __init rh_shadowman(char *str) +-{ +- pr_info("RRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRR\n"); +- pr_info("RRRRRRRRRRRRRRRRRRrrrrrrrrrrrrrrrORHRrrHRRRRRRRRRRRRRRRRRRRR\n"); +- pr_info("RRRRRRRRRRRRRRRRHrr8rrrrrrrrrrrrrrrrrrrrhRRRRRRRRRRRRRRRRRRR\n"); +- pr_info("RRRRRHRRRRRRRRRRRrrHRHRRRHHHrrrrrrrrrrrrrHRRRRRRRRRRRRRRRRRR\n"); +- pr_info("RRRRRRRRRRRRRRRHrrrrrHrrrrrrrrrrrrrrrrrrrrRRRRRRRRRRRRRRRRRR\n"); +- pr_info("RRRRRRRRRHh88hhRHrrrrrrrrrrrrrrrrrrrrrrrrrrHRRRRRRRRRRRRRRRR\n"); +- pr_info("RRRRRRrrrrrrrrrRHRH8rrrrrrrrrrrrrrrrrrrrrrr8RRRRRRRRRRRRRRRR\n"); +- pr_info("RRRRH8rrrrrrrrrrRHRRRRRRRRRHrrrrrrrrrrrrrrrrRrhHRHRRRRRRRRRR\n"); +- pr_info("RRRRRROrrrrrrrrrrrORRRRRRRRRRRrrrrrrrrrrrrrHrrrrrrhRRRRRRRRR\n"); +- pr_info("RRRRRRRROrrrrrrrrrrrrrrr8RRRRHRrrrrrrrrrrrrrrrrrrrrrHRRRRRRR\n"); +- pr_info("RRRRRRRRRRRRRHhrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrRRRRRRRR\n"); +- pr_info("RRRRRRRRRRRRH. .HHHrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrRRRRRRRRR\n"); +- pr_info("RRRRRRRRRRRR. .RRhRRHH8rrrrrrrrrrrrrrrrrrrrr8RRRRRRRRRRRR\n"); +- pr_info("RRRRRRRRRRRRR~ .RRRRRRRRRHHh8OOOOO8HRRHRRRRRRRRRRRRRRR\n"); +- pr_info("R,```` RRR8 .hHRRRh\\hHH:=HRh.RRRRRRRRRRRRRRRRRRR\n"); +- pr_info("RR ORRRRRRRRRRRRRRRRRR\n"); +- pr_info("RRR ,HHtaa HRRRRRRRRRRRRRRRRRR\n"); +- pr_info("RRRRO. .RRRRO. . .RRRRRRR\n"); +- pr_info("RRRRRR ,RRHh, :RRRRRRRR\n"); +- pr_info("RRRRRRRR HRR :RRRRRRRRRR\n"); +- pr_info("RRRRRRRRRRr .. ,RRRRRRRRRRRRR\n"); +- pr_info("RRRRRRRRRRRRRt . .HRRRRRRRRRRRRRRR\n"); +- pr_info("RRRRRRRRRRRRRRRRRr. =RRRRRRRRRRRRRRRRRRRR\n"); +- pr_info("RRRRRRRRRRRRRRRRRRRRRRRRHHr: .:tRhRRRRRRRRRRRRRRRRRRRRRRRRRR\n"); +- pr_info(" "); +- pr_info(" Long Live Shadowman!"); +- pr_info("576527726520686972696e6721a68747470733a2f2f7777772e7265646861742e636f6d2f6a6f6273"); +- pr_info(" "); +- return 1; +-} +- +-__setup("shadowman", rh_shadowman); ++// This file has been intentionally left blank +-- +2.41.0 + + diff --git a/SOURCES/Makefile.rhelver b/SOURCES/Makefile.rhelver index e00880e24..a89c2c062 100644 --- a/SOURCES/Makefile.rhelver +++ b/SOURCES/Makefile.rhelver @@ -12,7 +12,7 @@ RHEL_MINOR = 5 # # Use this spot to avoid future merge conflicts. # Do not trim this comment. -RHEL_RELEASE = 503.26.1 +RHEL_RELEASE = 503.29.1 # # ZSTREAM diff --git a/SOURCES/bug34729535-change-certified-hw-message.patch b/SOURCES/bug34729535-change-certified-hw-message.patch new file mode 100644 index 000000000..db0b136ea --- /dev/null +++ b/SOURCES/bug34729535-change-certified-hw-message.patch @@ -0,0 +1,19 @@ +Update message about certified hardware list. + +Orabug: 34729535 + +Signed-off-by: Kevin Lyons +Reviewed-by: Laurence Rochfort +--- +diff -ruN linux-5.14.0-160.el8.x86_64.orig/init/main.c linux-5.14.0-160.el8.x86_64/init/main.c +--- linux-5.14.0-160.el8.x86_64.orig/init/main.c 2022-08-25 13:57:06.000000000 -0700 ++++ linux-5.14.0-160.el8.x86_64/init/main.c 2022-10-26 13:15:39.700724777 -0700 +@@ -936,7 +936,7 @@ + boot_cpu_init(); + page_address_init(); + pr_notice("%s", linux_banner); +- pr_notice("The list of certified hardware and cloud instances for Red Hat Enterprise Linux 9 can be viewed at the Red Hat Ecosystem Catalog, https://catalog.redhat.com.\n"); ++ pr_notice("The list of certified hardware for Oracle Linux 9 can be viewed at the Oracle Linux Certification List https://linux.oracle.com/hardware-certifications\n"); + early_security_init(); + setup_arch(&command_line); + setup_boot_config(); diff --git a/SOURCES/gating.yaml b/SOURCES/gating.yaml index 4565a4bde..f0d206bf9 100644 --- a/SOURCES/gating.yaml +++ b/SOURCES/gating.yaml @@ -3,10 +3,14 @@ product_versions: - rhel-9 decision_context: osci_compose_gate rules: - - !PassingTestCaseRule {test_case_name: cki.tier1-aarch64.functional} - - !PassingTestCaseRule {test_case_name: cki.tier1-ppc64le.functional} - - !PassingTestCaseRule {test_case_name: cki.tier1-s390x.functional} - - !PassingTestCaseRule {test_case_name: cki.tier1-x86_64.functional} + - !PassingTestCaseRule {test_case_name: kernel-qe.kernel-ci.kernel-64k-aarch64.tier1.functional} + - !PassingTestCaseRule {test_case_name: kernel-qe.kernel-ci.kernel-aarch64.tier1.functional} + - !PassingTestCaseRule {test_case_name: kernel-qe.kernel-ci.kernel-debug-x86_64.tier1.functional} + - !PassingTestCaseRule {test_case_name: kernel-qe.kernel-ci.kernel-ppc64le.tier1.functional} + - !PassingTestCaseRule {test_case_name: kernel-qe.kernel-ci.kernel-rt-debug-x86_64.tier1.functional} + - !PassingTestCaseRule {test_case_name: kernel-qe.kernel-ci.kernel-rt-x86_64.tier1.functional} + - !PassingTestCaseRule {test_case_name: kernel-qe.kernel-ci.kernel-s390x.tier1.functional} + - !PassingTestCaseRule {test_case_name: kernel-qe.kernel-ci.kernel-x86_64.tier1.functional} - !PassingTestCaseRule {test_case_name: s1-aws-ci_x86_64.brew-build.tier1.functional} - !PassingTestCaseRule {test_case_name: s1-aws-ci_aarch64.brew-build.tier1.functional} - !PassingTestCaseRule {test_case_name: s1-azure-ci_x86_64.brew-build.tier1.functional} diff --git a/SOURCES/kernel.changelog b/SOURCES/kernel.changelog index 5a5040129..e8f21bf8d 100644 --- a/SOURCES/kernel.changelog +++ b/SOURCES/kernel.changelog @@ -1,3 +1,71 @@ +* Tue Feb 25 2025 Chao YE [5.14.0-503.29.1.el9_5] +- rhel-9.5: gate on kernel-qe tests results not cki ones (Bruno Goncalves) +- ice: implement low latency PHY timer updates (Petr Oros) [RHEL-75466] +- ice: check low latency PHY timer update firmware capability (Petr Oros) [RHEL-75466] +- ice: add lock to protect low latency interface (Petr Oros) [RHEL-75466] +- ice: rename TS_LL_READ* macros to REG_LL_PROXY_H_* (Petr Oros) [RHEL-75466] +- ice: use read_poll_timeout_atomic in ice_read_phy_tstamp_ll_e810 (Petr Oros) [RHEL-75466] +- smb: client: get rid of kstrdup() in get_ses_refpath() (Paulo Alcantara) [RHEL-72875] +- smb: client: fix noisy when tree connecting to DFS interlink targets (Paulo Alcantara) [RHEL-72875] +- smb: client: don't trust DFSREF_STORAGE_SERVER bit (Paulo Alcantara) [RHEL-72875] +- smb: client: don't check for @leaf_fullpath in match_server() (Paulo Alcantara) [RHEL-72875] +- smb: client: get rid of TCP_Server_Info::refpath_lock (Paulo Alcantara) [RHEL-72875] +- smb: client: don't retry DFS targets on server shutdown (Paulo Alcantara) [RHEL-72875] +- smb: client: fix return value of parse_dfs_referrals() (Paulo Alcantara) [RHEL-72875] +- smb: client: optimize referral walk on failed link targets (Paulo Alcantara) [RHEL-72875] +- smb: client: provide dns_resolve_{unc,name} helpers (Paulo Alcantara) [RHEL-72875] +- smb: client: parse DNS domain name from domain= option (Paulo Alcantara) [RHEL-72875] +- smb: client: fix DFS mount against old servers with NTLMSSP (Paulo Alcantara) [RHEL-72875] +- smb: client: parse av pair type 4 in CHALLENGE_MESSAGE (Paulo Alcantara) [RHEL-72875] +- smb: client: introduce av_for_each_entry() helper (Paulo Alcantara) [RHEL-72875] +- smb: client: fix double free of TCP_Server_Info::hostname (Paulo Alcantara) [RHEL-72875] +- cifs: support mounting with alternate password to allow password rotation (Paulo Alcantara) [RHEL-72875] +- cifs: support reconnect with alternate password for SMB1 (Paulo Alcantara) [RHEL-72875] +- smb: client: sync the root session and superblock context passwords before automounting (Paulo Alcantara) [RHEL-72875] +- cifs: unlock on error in smb3_reconfigure() (Paulo Alcantara) [RHEL-72875] +- cifs: during remount, make sure passwords are in sync (Paulo Alcantara) [RHEL-72875] +- smb: client: Handle kstrdup failures for passwords (Paulo Alcantara) [RHEL-72875] {CVE-2024-50120} +- smb: client: fix TCP timers deadlock after rmmod (Paulo Alcantara) [RHEL-72875] {CVE-2024-54680} +- smb: client: Fix use-after-free of network namespace. (Paulo Alcantara) [RHEL-72875] {CVE-2024-53095} +- Fix spelling errors in Server Message Block (Paulo Alcantara) [RHEL-72875] +- af_packet: do not call packet_read_pending() from tpacket_destruct_skb() (CKI Backport Bot) [RHEL-78423] +Resolves: RHEL-72875, RHEL-75466, RHEL-78423 + +* Wed Feb 19 2025 Chao YE [5.14.0-503.28.1.el9_5] +- bnxt_en: Fix GSO type for HW GRO packets on 5750X chips (CKI Backport Bot) [RHEL-73726] +- intel_idle: Disable promotion to C1E on Jasper Lake and Elkhart Lake (David Arcari) [RHEL-62985] +- intel_idle: add Granite Rapids Xeon support (David Arcari) [RHEL-62985] +- intel_idle: Switch to new Intel CPU model defines (David Arcari) [RHEL-62985] +- x86/resctrl: Remove redundant variable in mbm_config_write_domain() (David Arcari) [RHEL-59001] +- x86/resctrl: Read supported bandwidth sources from CPUID (David Arcari) [RHEL-59001] +- x86/resctrl: Remove hard-coded memory bandwidth limit (David Arcari) [RHEL-59001] +- mei: me: disable RPL-S on SPS and IGN firmwares (CKI Backport Bot) [RHEL-60895] +- smb: client: change return value in open_cached_dir_by_dentry() if !cfids (Jay Shin) [RHEL-75935] +- smb: client: disable directory caching when dir_cache_timeout is zero (Jay Shin) [RHEL-75935] +- smb: client: remove unnecessary checks in open_cached_dir() (Jay Shin) [RHEL-75935] +- smb: prevent use-after-free due to open_cached_dir error paths (Jay Shin) [RHEL-75935] {CVE-2024-53177} +- smb: Don't leak cfid when reconnect races with open_cached_dir (Jay Shin) [RHEL-75935] {CVE-2024-53178} +- smb3: request handle caching when caching directories (Jay Shin) [RHEL-75935] +- bnxt_en: Unregister PTP during PCI shutdown and suspend (Michal Schmidt) [RHEL-69514] +- bnxt_en: Refactor bnxt_ptp_init() (Michal Schmidt) [RHEL-69514] +- smb: client: ignore unhandled reparse tags (Jay Shin) [RHEL-77743] +- smb: client: fix oops due to unset link speed (Jay Shin) [RHEL-77359] +Resolves: RHEL-59001, RHEL-60895, RHEL-62985, RHEL-69514, RHEL-73726, RHEL-75935, RHEL-77359, RHEL-77743 + +* Wed Feb 12 2025 Chao YE [5.14.0-503.27.1.el9_5] +- NFS: enable nconnect for RDMA (Benjamin Coddington) [RHEL-77179] +- Revert "scsi: lpfc: Early return after marking final NLP_DROPPED flag in dev_loss_tmo" (Dick Kennedy) [RHEL-70933] +- idpf: fix idpf_vc_core_init error path (CKI Backport Bot) [RHEL-70191] +- idpf: avoid vport access in idpf_get_link_ksettings (CKI Backport Bot) [RHEL-70191] +- ip6mr: fix tables suspicious RCU usage (Andrea Claudi) [RHEL-71730] +- ipmr: tune the ipmr_can_free_table() checks. (Andrea Claudi) [RHEL-71730] +- ipmr: add debug check for mr table cleanup (Andrea Claudi) [RHEL-71730] +- net: ip6mr: add RTM_GETROUTE netlink op (Andrea Claudi) [RHEL-71730] +- i40e: add ability to reset VF for Tx and Rx MDD events (Michal Schmidt) [RHEL-75972] +- tcp: fix mptcp DSS corruption due to large pmtu xmit (Paolo Abeni) [RHEL-62215] +- mptcp: handle consistently DSS corruption (Paolo Abeni) [RHEL-62215] +Resolves: RHEL-62215, RHEL-70191, RHEL-70933, RHEL-71730, RHEL-75972, RHEL-77179 + * Mon Feb 10 2025 Chao YE [5.14.0-503.26.1.el9_5] - redhat: drop Y issues from changelog (Jan Stancek) - media: uvcvideo: Skip parsing frames of type UVC_VS_UNDEFINED in uvc_parse_format (CKI Backport Bot) [RHEL-78075] {CVE-2024-53104} diff --git a/SOURCES/olkmod_signing_key.pem b/SOURCES/olkmod_signing_key.pem new file mode 100644 index 000000000..7a51daf16 --- /dev/null +++ b/SOURCES/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/SOURCES/x509.genkey.rhel b/SOURCES/x509.genkey.rhel index b1bbe387f..5b7056d65 100644 --- a/SOURCES/x509.genkey.rhel +++ b/SOURCES/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 diff --git a/SPECS/kernel.spec b/SPECS/kernel.spec old mode 100644 new mode 100755 index 9589f126f..ce8ee106b --- a/SPECS/kernel.spec +++ b/SPECS/kernel.spec @@ -104,7 +104,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 @@ -165,15 +165,15 @@ Summary: The Linux kernel # define buildid .local %define specversion 5.14.0 %define patchversion 5.14 -%define pkgrelease 503.26.1 +%define pkgrelease 503.29.1 %define kversion 5 -%define tarfile_release 5.14.0-503.26.1.el9_5 +%define tarfile_release 5.14.0-503.29.1.el9_5 # This is needed to do merge window version magic %define patchlevel 14 # This allows pkg_release to have configurable %%{?dist} tag -%define specrelease 503.26.1%{?buildid}%{?dist} +%define specrelease 503.29.1%{?buildid}%{?dist} # This defines the kabi tarball version -%define kabiversion 5.14.0-503.26.1.el9_5 +%define kabiversion 5.14.0-503.29.1.el9_5 # # End of genspec.sh variables @@ -645,6 +645,9 @@ Requires: kernel-modules-core-uname-r = %{KVERREL} Provides: installonlypkg(kernel) %endif +Provides: oracle(kernel-sig-key) == 202204 +Conflicts: shim-ia32 <= 15.3-1.0.5.el9 +Conflicts: shim-x64 <= 15.3-1.0.5.el9 # # List the packages used during the kernel build @@ -793,8 +796,6 @@ BuildRequires: WALinuxAgent-cvm # For UKI sb cert %if 0%{?centos} BuildRequires: centos-sb-certs >= 9.0-23 -%else -BuildRequires: redhat-sb-certs >= 9.4-0.1 %endif %endif @@ -811,30 +812,10 @@ Source2: kernel.changelog %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 - %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 redhatsecureboot501 -%endif -%ifarch s390x -%define pesign_name_0 redhatsecureboot302 -%endif -%ifarch ppc64le -%define pesign_name_0 redhatsecureboot701 -%endif -%endif +%define pesign_name_0 OracleSecureBootkernelsigningkey2 # signkernel %endif @@ -919,14 +900,20 @@ Source102: rhelimaca1.x509 Source103: rhelima.x509 Source104: rhelima_centos.x509 Source105: nvidiagpuoot001.x509 +# Oracle Linux IMA CA certificate +Source106: olimaca1.x509 +# Oracle Linux IMA signing certificate +Source107: olima1.x509 %if 0%{?centos} %define ima_signing_cert %{SOURCE104} %else %define ima_signing_cert %{SOURCE103} +%define ima_signing_cert_ol %{SOURCE107} %endif %define ima_cert_name ima.cer +%define ima_cert_name_ol ima_ol.cer Source150: dracut-virt.conf @@ -966,6 +953,9 @@ Source4000: README.rst Source4001: rpminspect.yaml Source4002: gating.yaml +# Oracle Linux RHCK Module Signing Key +Source5001: olkmod_signing_key.pem + ## Patches needed for building this package %if !%{nopatches} @@ -973,8 +963,12 @@ Source4002: gating.yaml Patch1: patch-%{patchversion}-redhat.patch %endif +# Oracle patches +Patch1000: bug34729535-change-certified-hw-message.patch + # empty final patch to facilitate testing of kernel patches Patch999999: linux-kernel-test.patch +Patch1000000: 1000-debrand-some-messages.patch # END OF PATCH DEFINITIONS @@ -1123,10 +1117,10 @@ This package provides debug information for the libperf package. %package -n kernel-tools Summary: Assortment of tools for the Linux kernel %ifarch %{cpupowerarchs} -Provides: cpupowerutils = 1:009-0.6.p1 +Provides: cpupowerutils = 1:009-0.6.p1 Obsoletes: cpupowerutils < 1:009-0.6.p1 -Provides: cpufreq-utils = 1:009-0.6.p1 -Provides: cpufrequtils = 1:009-0.6.p1 +Provides: cpufreq-utils = 1:009-0.6.p1 +Provides: cpufrequtils = 1:009-0.6.p1 Obsoletes: cpufreq-utils < 1:009-0.6.p1 Obsoletes: cpufrequtils < 1:009-0.6.p1 Obsoletes: cpuspeed < 1:1.5-16 @@ -1147,7 +1141,7 @@ from the kernel source. Summary: Assortment of tools for the Linux kernel Requires: kernel-tools = %{version}-%{release} %ifarch %{cpupowerarchs} -Provides: cpupowerutils-devel = 1:009-0.6.p1 +Provides: cpupowerutils-devel = 1:009-0.6.p1 Obsoletes: cpupowerutils-devel < 1:009-0.6.p1 %endif Requires: kernel-tools-libs = %{version}-%{release} @@ -1713,6 +1707,7 @@ cp -a %{SOURCE1} . ApplyOptionalPatch patch-%{patchversion}-redhat.patch %endif +ApplyPatch bug34729535-change-certified-hw-message.patch ApplyOptionalPatch linux-kernel-test.patch # END OF PATCH APPLICATIONS @@ -1792,6 +1787,11 @@ openssl x509 -inform der -in %{SOURCE101} -out rhelkpatch1.pem openssl x509 -inform der -in %{SOURCE102} -out rhelimaca1.pem openssl x509 -inform der -in %{SOURCE105} -out nvidiagpuoot001.pem cat rheldup3.pem rhelkpatch1.pem rhelimaca1.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 %if %{signkernel} %ifarch s390x ppc64le openssl x509 -inform der -in %{secureboot_ca_0} -out secureboot.pem @@ -2459,8 +2459,11 @@ BuildKernel() { %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 ) @@ -2486,7 +2489,7 @@ BuildKernel() { python3 %{SOURCE151} %{SOURCE152} $KernelAddonsDirOut virt %{primary_target} %{_target_cpu} %if %{signkernel} - +%if ! %{?oraclelinux} %if 0%{?centos} UKI_secureboot_name=centossecureboot204 %else @@ -2508,6 +2511,7 @@ BuildKernel() { done # signkernel +%endif %endif pushd $RPM_BUILD_ROOT @@ -2585,7 +2589,7 @@ BuildKernel() { # prune junk from kernel-devel find $RPM_BUILD_ROOT/usr/src/kernels -name ".*.cmd" -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 mkdir -p $RPM_BUILD_ROOT%{_datadir}/doc/kernel-keys/$KernelVer %if %{signkernel} install -m 0644 %{secureboot_ca_0} $RPM_BUILD_ROOT%{_datadir}/doc/kernel-keys/$KernelVer/kernel-signing-ca.cer @@ -2599,6 +2603,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} @@ -3791,6 +3797,81 @@ fi # # %changelog +* Wed Mar 05 2025 Teo Gonzalez - [5.14.0-503.29.1.el9_5.OL9] +- 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 + +* Tue Feb 25 2025 Chao YE [5.14.0-503.29.1.el9_5] +- rhel-9.5: gate on kernel-qe tests results not cki ones (Bruno Goncalves) +- ice: implement low latency PHY timer updates (Petr Oros) [RHEL-75466] +- ice: check low latency PHY timer update firmware capability (Petr Oros) [RHEL-75466] +- ice: add lock to protect low latency interface (Petr Oros) [RHEL-75466] +- ice: rename TS_LL_READ* macros to REG_LL_PROXY_H_* (Petr Oros) [RHEL-75466] +- ice: use read_poll_timeout_atomic in ice_read_phy_tstamp_ll_e810 (Petr Oros) [RHEL-75466] +- smb: client: get rid of kstrdup() in get_ses_refpath() (Paulo Alcantara) [RHEL-72875] +- smb: client: fix noisy when tree connecting to DFS interlink targets (Paulo Alcantara) [RHEL-72875] +- smb: client: don't trust DFSREF_STORAGE_SERVER bit (Paulo Alcantara) [RHEL-72875] +- smb: client: don't check for @leaf_fullpath in match_server() (Paulo Alcantara) [RHEL-72875] +- smb: client: get rid of TCP_Server_Info::refpath_lock (Paulo Alcantara) [RHEL-72875] +- smb: client: don't retry DFS targets on server shutdown (Paulo Alcantara) [RHEL-72875] +- smb: client: fix return value of parse_dfs_referrals() (Paulo Alcantara) [RHEL-72875] +- smb: client: optimize referral walk on failed link targets (Paulo Alcantara) [RHEL-72875] +- smb: client: provide dns_resolve_{unc,name} helpers (Paulo Alcantara) [RHEL-72875] +- smb: client: parse DNS domain name from domain= option (Paulo Alcantara) [RHEL-72875] +- smb: client: fix DFS mount against old servers with NTLMSSP (Paulo Alcantara) [RHEL-72875] +- smb: client: parse av pair type 4 in CHALLENGE_MESSAGE (Paulo Alcantara) [RHEL-72875] +- smb: client: introduce av_for_each_entry() helper (Paulo Alcantara) [RHEL-72875] +- smb: client: fix double free of TCP_Server_Info::hostname (Paulo Alcantara) [RHEL-72875] +- cifs: support mounting with alternate password to allow password rotation (Paulo Alcantara) [RHEL-72875] +- cifs: support reconnect with alternate password for SMB1 (Paulo Alcantara) [RHEL-72875] +- smb: client: sync the root session and superblock context passwords before automounting (Paulo Alcantara) [RHEL-72875] +- cifs: unlock on error in smb3_reconfigure() (Paulo Alcantara) [RHEL-72875] +- cifs: during remount, make sure passwords are in sync (Paulo Alcantara) [RHEL-72875] +- smb: client: Handle kstrdup failures for passwords (Paulo Alcantara) [RHEL-72875] {CVE-2024-50120} +- smb: client: fix TCP timers deadlock after rmmod (Paulo Alcantara) [RHEL-72875] {CVE-2024-54680} +- smb: client: Fix use-after-free of network namespace. (Paulo Alcantara) [RHEL-72875] {CVE-2024-53095} +- Fix spelling errors in Server Message Block (Paulo Alcantara) [RHEL-72875] +- af_packet: do not call packet_read_pending() from tpacket_destruct_skb() (CKI Backport Bot) [RHEL-78423] + +* Wed Feb 19 2025 Chao YE [5.14.0-503.28.1.el9_5] +- bnxt_en: Fix GSO type for HW GRO packets on 5750X chips (CKI Backport Bot) [RHEL-73726] +- intel_idle: Disable promotion to C1E on Jasper Lake and Elkhart Lake (David Arcari) [RHEL-62985] +- intel_idle: add Granite Rapids Xeon support (David Arcari) [RHEL-62985] +- intel_idle: Switch to new Intel CPU model defines (David Arcari) [RHEL-62985] +- x86/resctrl: Remove redundant variable in mbm_config_write_domain() (David Arcari) [RHEL-59001] +- x86/resctrl: Read supported bandwidth sources from CPUID (David Arcari) [RHEL-59001] +- x86/resctrl: Remove hard-coded memory bandwidth limit (David Arcari) [RHEL-59001] +- mei: me: disable RPL-S on SPS and IGN firmwares (CKI Backport Bot) [RHEL-60895] +- smb: client: change return value in open_cached_dir_by_dentry() if !cfids (Jay Shin) [RHEL-75935] +- smb: client: disable directory caching when dir_cache_timeout is zero (Jay Shin) [RHEL-75935] +- smb: client: remove unnecessary checks in open_cached_dir() (Jay Shin) [RHEL-75935] +- smb: prevent use-after-free due to open_cached_dir error paths (Jay Shin) [RHEL-75935] {CVE-2024-53177} +- smb: Don't leak cfid when reconnect races with open_cached_dir (Jay Shin) [RHEL-75935] {CVE-2024-53178} +- smb3: request handle caching when caching directories (Jay Shin) [RHEL-75935] +- bnxt_en: Unregister PTP during PCI shutdown and suspend (Michal Schmidt) [RHEL-69514] +- bnxt_en: Refactor bnxt_ptp_init() (Michal Schmidt) [RHEL-69514] +- smb: client: ignore unhandled reparse tags (Jay Shin) [RHEL-77743] +- smb: client: fix oops due to unset link speed (Jay Shin) [RHEL-77359] + +* Wed Feb 12 2025 Chao YE [5.14.0-503.27.1.el9_5] +- NFS: enable nconnect for RDMA (Benjamin Coddington) [RHEL-77179] +- Revert "scsi: lpfc: Early return after marking final NLP_DROPPED flag in dev_loss_tmo" (Dick Kennedy) [RHEL-70933] +- idpf: fix idpf_vc_core_init error path (CKI Backport Bot) [RHEL-70191] +- idpf: avoid vport access in idpf_get_link_ksettings (CKI Backport Bot) [RHEL-70191] +- ip6mr: fix tables suspicious RCU usage (Andrea Claudi) [RHEL-71730] +- ipmr: tune the ipmr_can_free_table() checks. (Andrea Claudi) [RHEL-71730] +- ipmr: add debug check for mr table cleanup (Andrea Claudi) [RHEL-71730] +- net: ip6mr: add RTM_GETROUTE netlink op (Andrea Claudi) [RHEL-71730] +- i40e: add ability to reset VF for Tx and Rx MDD events (Michal Schmidt) [RHEL-75972] +- tcp: fix mptcp DSS corruption due to large pmtu xmit (Paolo Abeni) [RHEL-62215] +- mptcp: handle consistently DSS corruption (Paolo Abeni) [RHEL-62215] + * Mon Feb 10 2025 Chao YE [5.14.0-503.26.1.el9_5] - redhat: drop Y issues from changelog (Jan Stancek) - media: uvcvideo: Skip parsing frames of type UVC_VS_UNDEFINED in uvc_parse_format (CKI Backport Bot) [RHEL-78075] {CVE-2024-53104}