From 31121f90a77fa31b847526a0f8c5d441c7294244 Mon Sep 17 00:00:00 2001 From: Andrew Lukoshko Date: Fri, 30 Aug 2024 11:51:02 +0000 Subject: [PATCH 1/2] import OL kernel-5.14.0-427.33.1.el9_4 --- .gitignore | 8 +- .kernel.metadata | 8 +- SOURCES/1000-debrand-some-messages.patch | 59 ++++++ SOURCES/Makefile.rhelver | 2 +- ...34729535-change-certified-hw-message.patch | 19 ++ SOURCES/kernel-aarch64-64k-debug-rhel.config | 1 + SOURCES/kernel-aarch64-64k-rhel.config | 1 + SOURCES/kernel-aarch64-debug-rhel.config | 1 + SOURCES/kernel-aarch64-rhel.config | 1 + SOURCES/kernel-aarch64-rt-debug-rhel.config | 1 + SOURCES/kernel-aarch64-rt-rhel.config | 1 + SOURCES/kernel-ppc64le-debug-rhel.config | 1 + SOURCES/kernel-ppc64le-rhel.config | 1 + SOURCES/kernel-s390x-debug-rhel.config | 1 + SOURCES/kernel-s390x-rhel.config | 1 + SOURCES/kernel-s390x-zfcpdump-rhel.config | 1 + SOURCES/kernel-x86_64-debug-rhel.config | 1 + SOURCES/kernel-x86_64-rhel.config | 1 + SOURCES/kernel-x86_64-rt-debug-rhel.config | 1 + SOURCES/kernel-x86_64-rt-rhel.config | 1 + SOURCES/olkmod_signing_key.pem | 24 +++ SOURCES/x509.genkey.rhel | 6 +- SPECS/kernel.spec | 169 ++++++++++++++---- 23 files changed, 266 insertions(+), 44 deletions(-) create mode 100644 SOURCES/1000-debrand-some-messages.patch create mode 100644 SOURCES/bug34729535-change-certified-hw-message.patch create mode 100644 SOURCES/olkmod_signing_key.pem mode change 100644 => 100755 SPECS/kernel.spec diff --git a/.gitignore b/.gitignore index 93c7e74ca..0ec6f6444 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,9 @@ -SOURCES/kernel-abi-stablelists-5.14.0-427.31.1.el9_4.tar.bz2 -SOURCES/kernel-kabi-dw-5.14.0-427.31.1.el9_4.tar.bz2 -SOURCES/linux-5.14.0-427.31.1.el9_4.tar.xz +SOURCES/kernel-abi-stablelists-5.14.0-427.33.1.el9_4.tar.bz2 +SOURCES/kernel-kabi-dw-5.14.0-427.33.1.el9_4.tar.bz2 +SOURCES/linux-5.14.0-427.33.1.el9_4.tar.xz SOURCES/nvidiagpuoot001.x509 +SOURCES/olima1.x509 +SOURCES/olimaca1.x509 SOURCES/rheldup3.x509 SOURCES/rhelima.x509 SOURCES/rhelima_centos.x509 diff --git a/.kernel.metadata b/.kernel.metadata index 8a2d61fa8..b5ce90a05 100644 --- a/.kernel.metadata +++ b/.kernel.metadata @@ -1,7 +1,9 @@ -e702fc158f91cbbc800ce5d7bb717902d3615788 SOURCES/kernel-abi-stablelists-5.14.0-427.31.1.el9_4.tar.bz2 -cff4c079f7c27f4b9a6d0df15efdd1240fd2ec2a SOURCES/kernel-kabi-dw-5.14.0-427.31.1.el9_4.tar.bz2 -3056b9b862af226d016a75c5112a0a60461fc3db SOURCES/linux-5.14.0-427.31.1.el9_4.tar.xz +68bf97bf6568121d55c8dc33ed7b072b43560ddf SOURCES/kernel-abi-stablelists-5.14.0-427.33.1.el9_4.tar.bz2 +eb5e4688ec329e5f7272a7160a534a27c3462b18 SOURCES/kernel-kabi-dw-5.14.0-427.33.1.el9_4.tar.bz2 +85c884a438f0466bf166e150b6d5484f4cb97068 SOURCES/linux-5.14.0-427.33.1.el9_4.tar.xz 4fff8080e88afffc06d8ef5004db8d53bb21237f SOURCES/nvidiagpuoot001.x509 +706ae01dd14efa38f0f565a3706acac19c78df02 SOURCES/olima1.x509 +6e3f0d61414c0b50f48dc2d4c3b3cd024e1c3a43 SOURCES/olimaca1.x509 95b9b811c7b0a6c98b2eafc4e7d6d24f2cb63289 SOURCES/rheldup3.x509 99e571f9de4188f3b5fdf1f84ff73f6cc4bb6a0e SOURCES/rhelima.x509 61d5a223ff0c79189505abae77e0087c4b2d2b47 SOURCES/rhelima_centos.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 544458841..562e0a1eb 100644 --- a/SOURCES/Makefile.rhelver +++ b/SOURCES/Makefile.rhelver @@ -12,7 +12,7 @@ RHEL_MINOR = 4 # # Use this spot to avoid future merge conflicts. # Do not trim this comment. -RHEL_RELEASE = 427.31.1 +RHEL_RELEASE = 427.33.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/kernel-aarch64-64k-debug-rhel.config b/SOURCES/kernel-aarch64-64k-debug-rhel.config index 01e8c594f..b15cc9dcd 100644 --- a/SOURCES/kernel-aarch64-64k-debug-rhel.config +++ b/SOURCES/kernel-aarch64-64k-debug-rhel.config @@ -1434,6 +1434,7 @@ CONFIG_DRM_LOAD_EDID_FIRMWARE=y CONFIG_DRM=m # CONFIG_DRM_MALI_DISPLAY is not set # CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW is not set +CONFIG_DRM_MGAG200_DISABLE_WRITECOMBINE=y CONFIG_DRM_MGAG200=m # CONFIG_DRM_MSM is not set # CONFIG_DRM_MXSFB is not set diff --git a/SOURCES/kernel-aarch64-64k-rhel.config b/SOURCES/kernel-aarch64-64k-rhel.config index 7c4bf74e5..1e05626b0 100644 --- a/SOURCES/kernel-aarch64-64k-rhel.config +++ b/SOURCES/kernel-aarch64-64k-rhel.config @@ -1426,6 +1426,7 @@ CONFIG_DRM_LOAD_EDID_FIRMWARE=y CONFIG_DRM=m # CONFIG_DRM_MALI_DISPLAY is not set # CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW is not set +CONFIG_DRM_MGAG200_DISABLE_WRITECOMBINE=y CONFIG_DRM_MGAG200=m # CONFIG_DRM_MSM is not set # CONFIG_DRM_MXSFB is not set diff --git a/SOURCES/kernel-aarch64-debug-rhel.config b/SOURCES/kernel-aarch64-debug-rhel.config index fa7f3dd11..f55d9e381 100644 --- a/SOURCES/kernel-aarch64-debug-rhel.config +++ b/SOURCES/kernel-aarch64-debug-rhel.config @@ -1431,6 +1431,7 @@ CONFIG_DRM_LOAD_EDID_FIRMWARE=y CONFIG_DRM=m # CONFIG_DRM_MALI_DISPLAY is not set # CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW is not set +CONFIG_DRM_MGAG200_DISABLE_WRITECOMBINE=y CONFIG_DRM_MGAG200=m # CONFIG_DRM_MSM is not set # CONFIG_DRM_MXSFB is not set diff --git a/SOURCES/kernel-aarch64-rhel.config b/SOURCES/kernel-aarch64-rhel.config index 58f2b0277..50dfa90dd 100644 --- a/SOURCES/kernel-aarch64-rhel.config +++ b/SOURCES/kernel-aarch64-rhel.config @@ -1423,6 +1423,7 @@ CONFIG_DRM_LOAD_EDID_FIRMWARE=y CONFIG_DRM=m # CONFIG_DRM_MALI_DISPLAY is not set # CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW is not set +CONFIG_DRM_MGAG200_DISABLE_WRITECOMBINE=y CONFIG_DRM_MGAG200=m # CONFIG_DRM_MSM is not set # CONFIG_DRM_MXSFB is not set diff --git a/SOURCES/kernel-aarch64-rt-debug-rhel.config b/SOURCES/kernel-aarch64-rt-debug-rhel.config index c3b42119e..319fe3169 100644 --- a/SOURCES/kernel-aarch64-rt-debug-rhel.config +++ b/SOURCES/kernel-aarch64-rt-debug-rhel.config @@ -1470,6 +1470,7 @@ CONFIG_DRM_LOAD_EDID_FIRMWARE=y CONFIG_DRM=m # CONFIG_DRM_MALI_DISPLAY is not set # CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW is not set +CONFIG_DRM_MGAG200_DISABLE_WRITECOMBINE=y CONFIG_DRM_MGAG200=m # CONFIG_DRM_MSM is not set # CONFIG_DRM_MXSFB is not set diff --git a/SOURCES/kernel-aarch64-rt-rhel.config b/SOURCES/kernel-aarch64-rt-rhel.config index e00266c3a..26607d575 100644 --- a/SOURCES/kernel-aarch64-rt-rhel.config +++ b/SOURCES/kernel-aarch64-rt-rhel.config @@ -1462,6 +1462,7 @@ CONFIG_DRM_LOAD_EDID_FIRMWARE=y CONFIG_DRM=m # CONFIG_DRM_MALI_DISPLAY is not set # CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW is not set +CONFIG_DRM_MGAG200_DISABLE_WRITECOMBINE=y CONFIG_DRM_MGAG200=m # CONFIG_DRM_MSM is not set # CONFIG_DRM_MXSFB is not set diff --git a/SOURCES/kernel-ppc64le-debug-rhel.config b/SOURCES/kernel-ppc64le-debug-rhel.config index 9c8d89173..10a642242 100644 --- a/SOURCES/kernel-ppc64le-debug-rhel.config +++ b/SOURCES/kernel-ppc64le-debug-rhel.config @@ -1217,6 +1217,7 @@ CONFIG_DRM_LOAD_EDID_FIRMWARE=y CONFIG_DRM=m # CONFIG_DRM_MALI_DISPLAY is not set # CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW is not set +CONFIG_DRM_MGAG200_DISABLE_WRITECOMBINE=y CONFIG_DRM_MGAG200=m # CONFIG_DRM_MXSFB is not set CONFIG_DRM_NOUVEAU_BACKLIGHT=y diff --git a/SOURCES/kernel-ppc64le-rhel.config b/SOURCES/kernel-ppc64le-rhel.config index 10363fb0c..ab64b81ec 100644 --- a/SOURCES/kernel-ppc64le-rhel.config +++ b/SOURCES/kernel-ppc64le-rhel.config @@ -1209,6 +1209,7 @@ CONFIG_DRM_LOAD_EDID_FIRMWARE=y CONFIG_DRM=m # CONFIG_DRM_MALI_DISPLAY is not set # CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW is not set +CONFIG_DRM_MGAG200_DISABLE_WRITECOMBINE=y CONFIG_DRM_MGAG200=m # CONFIG_DRM_MXSFB is not set CONFIG_DRM_NOUVEAU_BACKLIGHT=y diff --git a/SOURCES/kernel-s390x-debug-rhel.config b/SOURCES/kernel-s390x-debug-rhel.config index b6b474140..edff9eceb 100644 --- a/SOURCES/kernel-s390x-debug-rhel.config +++ b/SOURCES/kernel-s390x-debug-rhel.config @@ -1220,6 +1220,7 @@ CONFIG_DRM_KUNIT_TEST=m CONFIG_DRM=m # CONFIG_DRM_MALI_DISPLAY is not set # CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW is not set +CONFIG_DRM_MGAG200_DISABLE_WRITECOMBINE=y # CONFIG_DRM_MGAG200 is not set # CONFIG_DRM_MXSFB is not set CONFIG_DRM_NOUVEAU_BACKLIGHT=y diff --git a/SOURCES/kernel-s390x-rhel.config b/SOURCES/kernel-s390x-rhel.config index c1a8681a3..e051d0364 100644 --- a/SOURCES/kernel-s390x-rhel.config +++ b/SOURCES/kernel-s390x-rhel.config @@ -1212,6 +1212,7 @@ CONFIG_DRM_KUNIT_TEST=m CONFIG_DRM=m # CONFIG_DRM_MALI_DISPLAY is not set # CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW is not set +CONFIG_DRM_MGAG200_DISABLE_WRITECOMBINE=y # CONFIG_DRM_MGAG200 is not set # CONFIG_DRM_MXSFB is not set CONFIG_DRM_NOUVEAU_BACKLIGHT=y diff --git a/SOURCES/kernel-s390x-zfcpdump-rhel.config b/SOURCES/kernel-s390x-zfcpdump-rhel.config index 14d795804..44b6a504a 100644 --- a/SOURCES/kernel-s390x-zfcpdump-rhel.config +++ b/SOURCES/kernel-s390x-zfcpdump-rhel.config @@ -1218,6 +1218,7 @@ CONFIG_DRM_KUNIT_TEST=m CONFIG_DRM=m # CONFIG_DRM_MALI_DISPLAY is not set # CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW is not set +CONFIG_DRM_MGAG200_DISABLE_WRITECOMBINE=y # CONFIG_DRM_MGAG200 is not set # CONFIG_DRM_MXSFB is not set CONFIG_DRM_NOUVEAU_BACKLIGHT=y diff --git a/SOURCES/kernel-x86_64-debug-rhel.config b/SOURCES/kernel-x86_64-debug-rhel.config index 961e84eac..b2c16b2fb 100644 --- a/SOURCES/kernel-x86_64-debug-rhel.config +++ b/SOURCES/kernel-x86_64-debug-rhel.config @@ -1298,6 +1298,7 @@ CONFIG_DRM_LOAD_EDID_FIRMWARE=y CONFIG_DRM=m # CONFIG_DRM_MALI_DISPLAY is not set # CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW is not set +CONFIG_DRM_MGAG200_DISABLE_WRITECOMBINE=y CONFIG_DRM_MGAG200=m # CONFIG_DRM_MXSFB is not set CONFIG_DRM_NOUVEAU_BACKLIGHT=y diff --git a/SOURCES/kernel-x86_64-rhel.config b/SOURCES/kernel-x86_64-rhel.config index 5a69092f7..dd9daae83 100644 --- a/SOURCES/kernel-x86_64-rhel.config +++ b/SOURCES/kernel-x86_64-rhel.config @@ -1290,6 +1290,7 @@ CONFIG_DRM_LOAD_EDID_FIRMWARE=y CONFIG_DRM=m # CONFIG_DRM_MALI_DISPLAY is not set # CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW is not set +CONFIG_DRM_MGAG200_DISABLE_WRITECOMBINE=y CONFIG_DRM_MGAG200=m # CONFIG_DRM_MXSFB is not set CONFIG_DRM_NOUVEAU_BACKLIGHT=y diff --git a/SOURCES/kernel-x86_64-rt-debug-rhel.config b/SOURCES/kernel-x86_64-rt-debug-rhel.config index 663b4239c..489bb6cb3 100644 --- a/SOURCES/kernel-x86_64-rt-debug-rhel.config +++ b/SOURCES/kernel-x86_64-rt-debug-rhel.config @@ -1339,6 +1339,7 @@ CONFIG_DRM_LOAD_EDID_FIRMWARE=y CONFIG_DRM=m # CONFIG_DRM_MALI_DISPLAY is not set # CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW is not set +CONFIG_DRM_MGAG200_DISABLE_WRITECOMBINE=y CONFIG_DRM_MGAG200=m # CONFIG_DRM_MXSFB is not set CONFIG_DRM_NOUVEAU_BACKLIGHT=y diff --git a/SOURCES/kernel-x86_64-rt-rhel.config b/SOURCES/kernel-x86_64-rt-rhel.config index c7b36b32c..9e8e31f5d 100644 --- a/SOURCES/kernel-x86_64-rt-rhel.config +++ b/SOURCES/kernel-x86_64-rt-rhel.config @@ -1331,6 +1331,7 @@ CONFIG_DRM_LOAD_EDID_FIRMWARE=y CONFIG_DRM=m # CONFIG_DRM_MALI_DISPLAY is not set # CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW is not set +CONFIG_DRM_MGAG200_DISABLE_WRITECOMBINE=y CONFIG_DRM_MGAG200=m # CONFIG_DRM_MXSFB is not set CONFIG_DRM_NOUVEAU_BACKLIGHT=y 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 46d24f4d4..af614816c --- 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 427.31.1 +%define pkgrelease 427.33.1 %define kversion 5 -%define tarfile_release 5.14.0-427.31.1.el9_4 +%define tarfile_release 5.14.0-427.33.1.el9_4 # This is needed to do merge window version magic %define patchlevel 14 # This allows pkg_release to have configurable %%{?dist} tag -%define specrelease 427.31.1%{?buildid}%{?dist} +%define specrelease 427.33.1%{?buildid}%{?dist} # This defines the kabi tarball version -%define kabiversion 5.14.0-427.31.1.el9_4 +%define kabiversion 5.14.0-427.33.1.el9_4 # # 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 @@ -791,8 +794,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 @@ -808,30 +809,10 @@ Source1: Makefile.rhelver %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 @@ -916,14 +897,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 @@ -960,6 +947,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} @@ -967,8 +957,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 @@ -1117,10 +1111,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 @@ -1141,7 +1135,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} @@ -1696,6 +1690,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 @@ -1775,6 +1770,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 @@ -2442,8 +2442,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 ) @@ -2465,7 +2468,7 @@ BuildKernel() { $KernelUnifiedImage %if %{signkernel} - +%if ! %{?oraclelinux} %if 0%{?centos} UKI_secureboot_name=centossecureboot204 %else @@ -2481,6 +2484,7 @@ BuildKernel() { mv $KernelUnifiedImage.signed $KernelUnifiedImage # signkernel +%endif %endif pushd $RPM_BUILD_ROOT @@ -2558,7 +2562,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 @@ -2572,6 +2576,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} @@ -3732,6 +3738,101 @@ fi # # %changelog +* Wed Aug 28 2024 Teo Gonzalez [5.14.0-427.33.1.el9_4.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 + +* Fri Aug 16 2024 Scott Weaver [5.14.0-427.33.1.el9_4] +- bnxt_re: avoid shift undefined behavior in bnxt_qplib_alloc_init_hwq (Kamal Heib) [RHEL-44287] {CVE-2024-38540} +- netfilter: flowtable: validate pppoe header (Florian Westphal) [RHEL-44430 RHEL-33469] {CVE-2024-27016} +- crypto: bcm - Fix pointer arithmetic (cki-backport-bot) [RHEL-44116] {CVE-2024-38579} +- udp: Set SOCK_RCU_FREE earlier in udp_lib_get_port(). (CKI Backport Bot) [RHEL-51035 RHEL-51033] {CVE-2024-41041} +- netfilter: nf_tables: Fix potential data-race in __nft_obj_type_get() (Florian Westphal) [RHEL-42832 RHEL-33985] {CVE-2024-27019} +- netfilter: nf_tables: restrict tunnel object to NFPROTO_NETDEV (Florian Westphal) [RHEL-42832 RHEL-33985] +- netfilter: nf_tables: NULL pointer dereference in nf_tables_updobj() (Florian Westphal) [RHEL-42832 RHEL-33985] +- netfilter: nf_tables: release mutex after nft_gc_seq_end from abort path (Florian Westphal) [RHEL-41802 RHEL-33985] {CVE-2024-26925} +- netfilter: nf_tables: discard table flag update with pending basechain deletion (Florian Westphal) [RHEL-40231 RHEL-33985] {CVE-2024-35897} +- netfilter: nf_tables: reject table flag and netdev basechain updates (Florian Westphal) [RHEL-40231 RHEL-33985] +- netfilter: bridge: replace physindev with physinif in nf_bridge_info (Florian Westphal) [RHEL-42966 RHEL-37040] {CVE-2024-35839} +- netfilter: propagate net to nf_bridge_get_physindev (Florian Westphal) [RHEL-42966 RHEL-37040] {CVE-2024-35839} +- netfilter: nfnetlink_log: use proper helper for fetching physinif (Florian Westphal) [RHEL-42966 RHEL-37040] {CVE-2024-35839} +- netfilter: nf_queue: remove excess nf_bridge variable (Florian Westphal) [RHEL-42966 RHEL-37040] {CVE-2024-35839} +- netfilter: nft_limit: reject configurations that cause integer overflow (Florian Westphal) [RHEL-40065 RHEL-33985] {CVE-2024-26668} +- scsi: qedi: Fix crash while reading debugfs attribute (CKI Backport Bot) [RHEL-48339] {CVE-2024-40978} +- mm/huge_memory: don't unpoison huge_zero_folio (Aristeu Rozanski) [RHEL-47804] {CVE-2024-40914} +- tipc: force a dst refcount before doing decryption (Xin Long) [RHEL-48375 RHEL-6118] {CVE-2024-40983} +- netfilter: nft_set_rbtree: skip end interval element from gc (Florian Westphal) [RHEL-41265] {CVE-2024-26581} +- nvmet: fix a possible leak when destroy a ctrl during qp establishment (CKI Backport Bot) [RHEL-52021 RHEL-52019 RHEL-52020] {CVE-2024-42152} +- net: ntb_netdev: Move ntb_netdev_rx_handler() to call netif_rx() from __netif_rx() (CKI Backport Bot) [RHEL-51756] {CVE-2024-42110} +- netfilter: nf_tables: Fix potential data-race in __nft_flowtable_type_get() (Florian Westphal) [RHEL-40265 RHEL-33985] {CVE-2024-35898} +- netfilter: br_netfilter: remove WARN traps (CKI Backport Bot) [RHEL-42882] {CVE-2024-27415} +- netfilter: br_netfilter: skip conntrack input hook for promisc packets (CKI Backport Bot) [RHEL-42882] {CVE-2024-27415} +- netfilter: bridge: confirm multicast packets before passing them up the stack (CKI Backport Bot) [RHEL-42882] {CVE-2024-27415} +- netfilter: nf_conntrack_bridge: initialize err to 0 (CKI Backport Bot) [RHEL-42882] {CVE-2024-27415} +- netfilter: nf_tables: Fix potential data-race in __nft_expr_type_get() (Florian Westphal) [RHEL-42842 RHEL-33985] {CVE-2024-27020} + +* Mon Aug 12 2024 Scott Weaver [5.14.0-427.32.1.el9_4] +- REDHAT: Makefile, dont reset dist-git-tmp if set (Lucas Zampieri) +- net/mlx5e: Fix netif state handling (Benjamin Poirier) [RHEL-43872 RHEL-43870] {CVE-2024-38608} +- net/mlx5e: Add wrapping for auxiliary_driver ops and remove unused args (Benjamin Poirier) [RHEL-43872 RHEL-43870] {CVE-2024-38608} +- tun: add missing verification for short frame (Patrick Talbert) [RHEL-50202 RHEL-50203] {CVE-2024-41091} +- tap: add missing verification for short frame (Patrick Talbert) [RHEL-50264 RHEL-50265] {CVE-2024-41090} +- vfio/pci: Lock external INTx masking ops (Alex Williamson) [RHEL-43421 RHEL-30023] {CVE-2024-26810} +- net: bridge: xmit: make sure we have at least eth header len bytes (cki-backport-bot) [RHEL-44299] {CVE-2024-38538} +- KVM: arm64: Ensure target address is granule-aligned for range TLBI (Sebastian Ott) [RHEL-52248 RHEL-31215] +- RDMA/rxe: Fix seg fault in rxe_comp_queue_pkt (cki-backport-bot) [RHEL-44250] {CVE-2024-38544} +- NFSv4: Fix memory leak in nfs4_set_security_label (CKI Backport Bot) [RHEL-52082] {CVE-2024-41076} +- md/raid5: fix deadlock that raid5d() wait for itself to clear MD_SB_CHANGE_PENDING (Nigel Croxon) [RHEL-46421 RHEL-35393] {CVE-2024-39476} +- KVM: s390: fix LPSWEY handling (CKI Backport Bot) [RHEL-50074] +- cxl/port: Fix delete_endpoint() vs parent unregistration race (John W. Linville) [RHEL-39290 RHEL-23582] {CVE-2023-52771} +- net: ice: Fix potential NULL pointer dereference in ice_bridge_setlink() (Petr Oros) [RHEL-49862 RHEL-17486] {CVE-2024-26855} +- ice: fix LAG and VF lock dependency in ice_reset_vf() (Petr Oros) [RHEL-49820 RHEL-17486] {CVE-2024-36003} +- net: wwan: iosm: Fix tainted pointer delete is case of region creation fail (Jose Ignacio Tornos Martinez) [RHEL-47992 RHEL-9429] {CVE-2024-40939} +- wifi: cfg80211: Lock wiphy in cfg80211_get_station (CKI Backport Bot) [RHEL-47770] {CVE-2024-40911} +- wifi: mac80211: Fix deadlock in ieee80211_sta_ps_deliver_wakeup() (CKI Backport Bot) [RHEL-47788] {CVE-2024-40912} +- wifi: iwlwifi: mvm: check n_ssids before accessing the ssids (CKI Backport Bot) [RHEL-47920] {CVE-2024-40929} +- wifi: iwlwifi: mvm: don't read past the mfuart notifcation (CKI Backport Bot) [RHEL-48028] {CVE-2024-40941} +- seg6: fix parameter passing when calling NF_HOOK() in End.DX4 and End.DX6 behaviors (Hangbin Liu) [RHEL-48098 RHEL-45826] {CVE-2024-40957} +- ipv6: fix possible race in __fib6_drop_pcpu_from() (Hangbin Liu) [RHEL-47572 RHEL-45826] {CVE-2024-40905} +- redhat/configs: Enable CONFIG_DRM_MGAG200_DISABLE_WRITECOMBINE (Jocelyn Falempe) [RHEL-39581 RHEL-28760] +- drm/mgag200: Add an option to disable Write-Combine (Jocelyn Falempe) [RHEL-39581 RHEL-28760] +- drm/mgag200: Fix caching setup for remapped video memory (Scott Weaver) [RHEL-39581 RHEL-24102] +- Revert "drm/mgag200: Flush the cache to improve latency" (Scott Weaver) [RHEL-39581 RHEL-28760] +- net: psample: fix flag being set in wrong skb (Adrian Moreno) [RHEL-47275] +- net: openvswitch: store sampling probability in cb. (Adrian Moreno) [RHEL-47275] +- net: openvswitch: add psample action (Adrian Moreno) [RHEL-47275] +- net: psample: allow using rate as probability (Adrian Moreno) [RHEL-47275] +- net: psample: skip packet copy if no listeners (Adrian Moreno) [RHEL-47275] +- net: psample: add user cookie (Adrian Moreno) [RHEL-47275] +- i40e: fix: remove needless retries of NVM update (CKI Backport Bot) [RHEL-48169 RHEL-36692] +- ice: Reject pin requests with unsupported flags (Petr Oros) [RHEL-50388 RHEL-17486] +- ice: Don't process extts if PTP is disabled (Petr Oros) [RHEL-50388 RHEL-17486] +- ice: Fix improper extts handling (Petr Oros) [RHEL-50388 RHEL-17486] +- ice: stop destroying and reinitalizing Tx tracker during reset (Petr Oros) [RHEL-50388 RHEL-17486] +- ice: factor out ice_ptp_rebuild_owner() (Petr Oros) [RHEL-50388 RHEL-17486] +- ice: rename ice_ptp_tx_cfg_intr (Petr Oros) [RHEL-50388 RHEL-17486] +- ice: don't check has_ready_bitmap in E810 functions (Petr Oros) [RHEL-50388 RHEL-17486] +- ice: rename verify_cached to has_ready_bitmap (Petr Oros) [RHEL-50388 RHEL-17486] +- ice: pass reset type to PTP reset functions (Petr Oros) [RHEL-50388 RHEL-17486] +- ice: introduce PTP state machine (Petr Oros) [RHEL-50388 RHEL-17486] +- ice: make RX HW timestamp reading code more reusable (Petr Oros) [RHEL-50388 RHEL-17486] +- ice: Rename E822 to E82X (Petr Oros) [RHEL-50388 RHEL-17486] +- ice: periodically kick Tx timestamp interrupt (Petr Oros) [RHEL-50388 RHEL-17486] +- ice: Re-enable timestamping correctly after reset (Petr Oros) [RHEL-50388 RHEL-17486] +- ptp: introduce helpers to adjust by scaled parts per million (Petr Oros) [RHEL-50388 RHEL-17486] +- tty: n_gsm: require CAP_NET_ADMIN to attach N_GSM0710 ldisc (Andrew Halaney) [RHEL-42566 RHEL-24205] {CVE-2023-52880} +- netfilter: complete validation of user input (Phil Sutter) [RHEL-47384 RHEL-37212] {CVE-2024-35962} +- netfilter: validate user input for expected length (Phil Sutter) [RHEL-41668 RHEL-37212] {CVE-2024-35896} +- scsi: qla2xxx: Fix off by one in qla_edif_app_getstats() (Ewan D. Milne) [RHEL-40051 RHEL-39719] {CVE-2024-36025} +- x86/xen: Add some null pointer checking to smp.c (Vitaly Kuznetsov) [RHEL-37615 RHEL-33260] {CVE-2024-26908} +- x86/xen: Fix memory leak in xen_smp_intr_init{_pv}() (Prarit Bhargava) [RHEL-37615 RHEL-25415] + * Fri Aug 09 2024 Scott Weaver [5.14.0-427.31.1.el9_4] - net: fix __dst_negative_advice() race (CKI Backport Bot) [RHEL-46798] {CVE-2024-36971} - net: annotate data-races around sk->sk_dst_pending_confirm (CKI Backport Bot) [RHEL-46798] {CVE-2024-36971} From 52e35782aeb3d9ccc3eb0999cd42839d753dd2a9 Mon Sep 17 00:00:00 2001 From: Andrew Lukoshko Date: Fri, 30 Aug 2024 12:51:08 +0000 Subject: [PATCH 2/2] Revert OL modifications --- SOURCES/1000-debrand-some-messages.patch | 59 -------------- ...34729535-change-certified-hw-message.patch | 19 ----- SOURCES/olkmod_signing_key.pem | 24 ------ SOURCES/x509.genkey.rhel | 6 +- SPECS/kernel.spec | 76 ++++++++----------- 5 files changed, 33 insertions(+), 151 deletions(-) delete mode 100644 SOURCES/1000-debrand-some-messages.patch delete mode 100644 SOURCES/bug34729535-change-certified-hw-message.patch delete mode 100644 SOURCES/olkmod_signing_key.pem mode change 100755 => 100644 SPECS/kernel.spec diff --git a/SOURCES/1000-debrand-some-messages.patch b/SOURCES/1000-debrand-some-messages.patch deleted file mode 100644 index d82ef0f3d..000000000 --- a/SOURCES/1000-debrand-some-messages.patch +++ /dev/null @@ -1,59 +0,0 @@ -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/bug34729535-change-certified-hw-message.patch b/SOURCES/bug34729535-change-certified-hw-message.patch deleted file mode 100644 index db0b136ea..000000000 --- a/SOURCES/bug34729535-change-certified-hw-message.patch +++ /dev/null @@ -1,19 +0,0 @@ -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/olkmod_signing_key.pem b/SOURCES/olkmod_signing_key.pem deleted file mode 100644 index 7a51daf16..000000000 --- a/SOURCES/olkmod_signing_key.pem +++ /dev/null @@ -1,24 +0,0 @@ ------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 5b7056d65..b1bbe387f 100644 --- a/SOURCES/x509.genkey.rhel +++ b/SOURCES/x509.genkey.rhel @@ -5,9 +5,9 @@ prompt = no x509_extensions = myexts [ req_distinguished_name ] -O = Oracle America, Inc.,c=US -CN = Oracle CA Server -emailAddress = support@oracle.com +O = Red Hat +CN = Red Hat Enterprise Linux kernel signing key +emailAddress = secalert@redhat.com [ myexts ] basicConstraints=critical,CA:FALSE diff --git a/SPECS/kernel.spec b/SPECS/kernel.spec old mode 100755 new mode 100644 index af614816c..64046a86f --- 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 s390x ppc64le +%define secure_boot_arch x86_64 aarch64 s390x ppc64le %endif # Signing for secure boot authentication @@ -645,9 +645,6 @@ 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 @@ -794,6 +791,8 @@ 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 @@ -809,10 +808,30 @@ Source1: Makefile.rhelver %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 -%define pesign_name_0 OracleSecureBootkernelsigningkey2 +%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 # signkernel %endif @@ -897,20 +916,14 @@ 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 @@ -947,9 +960,6 @@ 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} @@ -957,12 +967,8 @@ Source5001: olkmod_signing_key.pem 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 @@ -1111,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 @@ -1135,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} @@ -1690,7 +1696,6 @@ 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 @@ -1770,11 +1775,6 @@ 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 @@ -2442,11 +2442,8 @@ 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 ) @@ -2468,7 +2465,7 @@ BuildKernel() { $KernelUnifiedImage %if %{signkernel} -%if ! %{?oraclelinux} + %if 0%{?centos} UKI_secureboot_name=centossecureboot204 %else @@ -2484,7 +2481,6 @@ BuildKernel() { mv $KernelUnifiedImage.signed $KernelUnifiedImage # signkernel -%endif %endif pushd $RPM_BUILD_ROOT @@ -2562,7 +2558,7 @@ BuildKernel() { # prune junk from kernel-devel find $RPM_BUILD_ROOT/usr/src/kernels -name ".*.cmd" -delete - # UEFI Secure Boot CA cert, which can be used to authenticate the kernel + # Red Hat 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 @@ -2576,8 +2572,6 @@ 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} @@ -3738,16 +3732,6 @@ fi # # %changelog -* Wed Aug 28 2024 Teo Gonzalez [5.14.0-427.33.1.el9_4.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 - * Fri Aug 16 2024 Scott Weaver [5.14.0-427.33.1.el9_4] - bnxt_re: avoid shift undefined behavior in bnxt_qplib_alloc_init_hwq (Kamal Heib) [RHEL-44287] {CVE-2024-38540} - netfilter: flowtable: validate pppoe header (Florian Westphal) [RHEL-44430 RHEL-33469] {CVE-2024-27016}