From 478618d56f7b03849b4c609bc6ec6b0800ef4003 Mon Sep 17 00:00:00 2001 From: rlmenge Date: Wed, 10 Jan 2024 15:57:39 -0800 Subject: [PATCH] Revert "[AUTOPATCHER-kernel] Kernel upgrade to version 5.15.143.1 - branch main (#7048)" (#7222) --- .../kernel-azure-signed.spec | 8 +------ .../kernel-hci-signed/kernel-hci-signed.spec | 8 +------ SPECS-SIGNED/kernel-signed/kernel-signed.spec | 8 +------ .../hyperv-daemons.signatures.json | 2 +- SPECS/hyperv-daemons/hyperv-daemons.spec | 8 +------ SPECS/kernel-azure/config | 2 +- SPECS/kernel-azure/config_aarch64 | 3 ++- .../kernel-azure/kernel-azure.signatures.json | 6 ++--- SPECS/kernel-azure/kernel-azure.spec | 8 +------ ...x5-Lag-move-lag-files-into-directory.patch | 16 +++++++------- SPECS/kernel-hci/config | 2 +- SPECS/kernel-hci/kernel-hci.signatures.json | 4 ++-- SPECS/kernel-hci/kernel-hci.spec | 9 +------- .../kernel-headers.signatures.json | 2 +- SPECS/kernel-headers/kernel-headers.spec | 8 +------ SPECS/kernel/CVE-2023-46862.nopatch | 3 --- SPECS/kernel/CVE-2023-6546.nopatch | 3 --- SPECS/kernel/CVE-2023-6622.nopatch | 3 --- SPECS/kernel/CVE-2023-6931.nopatch | 2 -- SPECS/kernel/CVE-2023-6932.nopatch | 3 --- SPECS/kernel/config | 2 +- SPECS/kernel/config_aarch64 | 3 ++- SPECS/kernel/kernel.signatures.json | 6 ++--- SPECS/kernel/kernel.spec | 8 +------ cgmanifest.json | 22 +++++++++---------- .../manifests/package/pkggen_core_aarch64.txt | 2 +- .../manifests/package/pkggen_core_x86_64.txt | 2 +- .../manifests/package/toolchain_aarch64.txt | 2 +- .../manifests/package/toolchain_x86_64.txt | 2 +- 29 files changed, 48 insertions(+), 109 deletions(-) delete mode 100644 SPECS/kernel/CVE-2023-46862.nopatch delete mode 100644 SPECS/kernel/CVE-2023-6546.nopatch delete mode 100644 SPECS/kernel/CVE-2023-6622.nopatch delete mode 100644 SPECS/kernel/CVE-2023-6931.nopatch delete mode 100644 SPECS/kernel/CVE-2023-6932.nopatch diff --git a/SPECS-SIGNED/kernel-azure-signed/kernel-azure-signed.spec b/SPECS-SIGNED/kernel-azure-signed/kernel-azure-signed.spec index 82198e8d92..a8b76a875f 100644 --- a/SPECS-SIGNED/kernel-azure-signed/kernel-azure-signed.spec +++ b/SPECS-SIGNED/kernel-azure-signed/kernel-azure-signed.spec @@ -9,7 +9,7 @@ %define uname_r %{version}-%{release} Summary: Signed Linux Kernel for Azure Name: kernel-azure-signed-%{buildarch} -Version: 5.15.145.1 +Version: 5.15.139.1 Release: 1%{?dist} License: GPLv2 Vendor: Microsoft Corporation @@ -153,12 +153,6 @@ ln -sf linux-%{uname_r}.cfg /boot/mariner.cfg %exclude /module_info.ld %changelog -* Wed Jan 03 2024 CBL-Mariner Servicing Account - 5.15.145.1-1 -- Auto-upgrade to 5.15.145.1 - -* Tue Dec 19 2023 CBL-Mariner Servicing Account - 5.15.143.1-1 -- Auto-upgrade to 5.15.143.1 - * Tue Dec 05 2023 CBL-Mariner Servicing Account - 5.15.139.1-1 - Auto-upgrade to 5.15.139.1 diff --git a/SPECS-SIGNED/kernel-hci-signed/kernel-hci-signed.spec b/SPECS-SIGNED/kernel-hci-signed/kernel-hci-signed.spec index 4141f6a0bc..e405fc4223 100644 --- a/SPECS-SIGNED/kernel-hci-signed/kernel-hci-signed.spec +++ b/SPECS-SIGNED/kernel-hci-signed/kernel-hci-signed.spec @@ -4,7 +4,7 @@ %define uname_r %{version}-%{release} Summary: Signed Linux Kernel for HCI Name: kernel-hci-signed-%{buildarch} -Version: 5.15.145.1 +Version: 5.15.139.1 Release: 1%{?dist} License: GPLv2 Vendor: Microsoft Corporation @@ -149,12 +149,6 @@ ln -sf linux-%{uname_r}.cfg /boot/mariner.cfg %exclude /module_info.ld %changelog -* Wed Jan 03 2024 CBL-Mariner Servicing Account - 5.15.145.1-1 -- Auto-upgrade to 5.15.145.1 - -* Tue Dec 19 2023 CBL-Mariner Servicing Account - 5.15.143.1-1 -- Auto-upgrade to 5.15.143.1 - * Tue Dec 05 2023 CBL-Mariner Servicing Account - 5.15.139.1-1 - Auto-upgrade to 5.15.139.1 diff --git a/SPECS-SIGNED/kernel-signed/kernel-signed.spec b/SPECS-SIGNED/kernel-signed/kernel-signed.spec index c8ab10fce6..82e6079ebf 100644 --- a/SPECS-SIGNED/kernel-signed/kernel-signed.spec +++ b/SPECS-SIGNED/kernel-signed/kernel-signed.spec @@ -9,7 +9,7 @@ %define uname_r %{version}-%{release} Summary: Signed Linux Kernel for %{buildarch} systems Name: kernel-signed-%{buildarch} -Version: 5.15.145.1 +Version: 5.15.139.1 Release: 1%{?dist} License: GPLv2 Vendor: Microsoft Corporation @@ -153,12 +153,6 @@ ln -sf linux-%{uname_r}.cfg /boot/mariner.cfg %exclude /module_info.ld %changelog -* Wed Jan 03 2024 CBL-Mariner Servicing Account - 5.15.145.1-1 -- Auto-upgrade to 5.15.145.1 - -* Tue Dec 19 2023 CBL-Mariner Servicing Account - 5.15.143.1-1 -- Auto-upgrade to 5.15.143.1 - * Tue Dec 05 2023 CBL-Mariner Servicing Account - 5.15.139.1-1 - Auto-upgrade to 5.15.139.1 diff --git a/SPECS/hyperv-daemons/hyperv-daemons.signatures.json b/SPECS/hyperv-daemons/hyperv-daemons.signatures.json index 9d24a48448..03cfce0b18 100644 --- a/SPECS/hyperv-daemons/hyperv-daemons.signatures.json +++ b/SPECS/hyperv-daemons/hyperv-daemons.signatures.json @@ -7,6 +7,6 @@ "hypervkvpd.service": "c1bb207cf9f388f8f3cf5b649abbf8cfe4c4fcf74538612946e68f350d1f265f", "hypervvss.rules": "94cead44245ef6553ab79c0bbac8419e3ff4b241f01bcec66e6f508098cbedd1", "hypervvssd.service": "22270d9f0f23af4ea7905f19c1d5d5495e40c1f782cbb87a99f8aec5a011078d", - "kernel-5.15.145.1.tar.gz": "6091e2b225ce3f9e9ea1ba76b1e49978567ecc59b24135cc5081ecf6d464662e" + "kernel-5.15.139.1.tar.gz": "7dc657637a9ef4d2491eeae364e6ab0132ea4db3b1a9db7c2601eaf009200459" } } \ No newline at end of file diff --git a/SPECS/hyperv-daemons/hyperv-daemons.spec b/SPECS/hyperv-daemons/hyperv-daemons.spec index 7e116346ef..313d71193d 100644 --- a/SPECS/hyperv-daemons/hyperv-daemons.spec +++ b/SPECS/hyperv-daemons/hyperv-daemons.spec @@ -8,7 +8,7 @@ %global udev_prefix 70 Summary: Hyper-V daemons suite Name: hyperv-daemons -Version: 5.15.145.1 +Version: 5.15.139.1 Release: 1%{?dist} License: GPLv2+ Vendor: Microsoft Corporation @@ -219,12 +219,6 @@ fi %{_sbindir}/lsvmbus %changelog -* Wed Jan 03 2024 CBL-Mariner Servicing Account - 5.15.145.1-1 -- Auto-upgrade to 5.15.145.1 - -* Tue Dec 19 2023 CBL-Mariner Servicing Account - 5.15.143.1-1 -- Auto-upgrade to 5.15.143.1 - * Tue Dec 05 2023 CBL-Mariner Servicing Account - 5.15.139.1-1 - Auto-upgrade to 5.15.139.1 diff --git a/SPECS/kernel-azure/config b/SPECS/kernel-azure/config index 72777372ff..657beca69e 100644 --- a/SPECS/kernel-azure/config +++ b/SPECS/kernel-azure/config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86_64 5.15.145.1 Kernel Configuration +# Linux/x86_64 5.15.139.1 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 11.2.0" CONFIG_CC_IS_GCC=y diff --git a/SPECS/kernel-azure/config_aarch64 b/SPECS/kernel-azure/config_aarch64 index ec1077c8f0..df1c4ceb03 100644 --- a/SPECS/kernel-azure/config_aarch64 +++ b/SPECS/kernel-azure/config_aarch64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 5.15.145.1 Kernel Configuration +# Linux/arm64 5.15.139.1 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 11.2.0" CONFIG_CC_IS_GCC=y @@ -3385,6 +3385,7 @@ CONFIG_DWMAC_ROCKCHIP=m CONFIG_DWMAC_SUN8I=m CONFIG_DWMAC_IMX8=m # CONFIG_DWMAC_INTEL_PLAT is not set +# CONFIG_DWMAC_LOONGSON is not set # CONFIG_STMMAC_PCI is not set CONFIG_NET_VENDOR_SUN=y CONFIG_HAPPYMEAL=m diff --git a/SPECS/kernel-azure/kernel-azure.signatures.json b/SPECS/kernel-azure/kernel-azure.signatures.json index afdc1c4731..78f3bef25a 100644 --- a/SPECS/kernel-azure/kernel-azure.signatures.json +++ b/SPECS/kernel-azure/kernel-azure.signatures.json @@ -1,9 +1,9 @@ { "Signatures": { "cbl-mariner-ca-20211013.pem": "5ef124b0924cb1047c111a0ecff1ae11e6ad7cac8d1d9b40f98f99334121f0b0", - "config": "76cb2120271e18580c5ec2ff0b5f1cf5a25684a1804751d670441a01aed0e1d8", - "config_aarch64": "0d9b8750a0f66858f0de5ab82746ee23777da928e6206481eb28ade77deddbad", + "config": "19c6638e60dd22da56be747f5f606fe4bc2adbe4b577ef5397e89f9d0c4ea87b", + "config_aarch64": "90e2887cacf5b35923a9a743225b6cc727adb19a3a7a174fa9dd7c2f4e78959a", "sha512hmac-openssl.sh": "02ab91329c4be09ee66d759e4d23ac875037c3b56e5a598e32fd1206da06a27f", - "kernel-5.15.145.1.tar.gz": "6091e2b225ce3f9e9ea1ba76b1e49978567ecc59b24135cc5081ecf6d464662e" + "kernel-5.15.139.1.tar.gz": "7dc657637a9ef4d2491eeae364e6ab0132ea4db3b1a9db7c2601eaf009200459" } } \ No newline at end of file diff --git a/SPECS/kernel-azure/kernel-azure.spec b/SPECS/kernel-azure/kernel-azure.spec index 761d1b144a..d09fa8e27d 100644 --- a/SPECS/kernel-azure/kernel-azure.spec +++ b/SPECS/kernel-azure/kernel-azure.spec @@ -27,7 +27,7 @@ Summary: Linux Kernel Name: kernel-azure -Version: 5.15.145.1 +Version: 5.15.139.1 Release: 1%{?dist} License: GPLv2 Vendor: Microsoft Corporation @@ -420,12 +420,6 @@ ln -sf linux-%{uname_r}.cfg /boot/mariner.cfg %{_sysconfdir}/bash_completion.d/bpftool %changelog -* Wed Jan 03 2024 CBL-Mariner Servicing Account - 5.15.145.1-1 -- Auto-upgrade to 5.15.145.1 - -* Tue Dec 19 2023 CBL-Mariner Servicing Account - 5.15.143.1-1 -- Auto-upgrade to 5.15.143.1 - * Tue Dec 05 2023 CBL-Mariner Servicing Account - 5.15.139.1-1 - Auto-upgrade to 5.15.139.1 diff --git a/SPECS/kernel-hci/0005-net-mlx5-Lag-move-lag-files-into-directory.patch b/SPECS/kernel-hci/0005-net-mlx5-Lag-move-lag-files-into-directory.patch index 8d01803537..928d44a37e 100644 --- a/SPECS/kernel-hci/0005-net-mlx5-Lag-move-lag-files-into-directory.patch +++ b/SPECS/kernel-hci/0005-net-mlx5-Lag-move-lag-files-into-directory.patch @@ -24,7 +24,7 @@ Signed-off-by: Saeed Mahameed rename drivers/net/ethernet/mellanox/mlx5/core/{lag_mp.h => lag/mp.h} (100%) diff --git a/drivers/net/ethernet/mellanox/mlx5/core/Makefile b/drivers/net/ethernet/mellanox/mlx5/core/Makefile -index 63032cd..bf2581b 100644 +index 63032cd6efb1..bf2581b43b1f 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/Makefile +++ b/drivers/net/ethernet/mellanox/mlx5/core/Makefile @@ -14,7 +14,7 @@ obj-$(CONFIG_MLX5_CORE) += mlx5_core.o @@ -46,7 +46,7 @@ index 63032cd..bf2581b 100644 en/mapping.o mlx5_core-$(CONFIG_MLX5_CLS_ACT) += en_tc.o en/rep/tc.o en/rep/neigh.o \ diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun.c b/drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun.c -index 303e6e7..fd4d9fb 100644 +index cf03297c8471..26be4ed9564b 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun.c @@ -11,8 +11,8 @@ @@ -61,7 +61,7 @@ index 303e6e7..fd4d9fb 100644 struct mlx5e_tc_tun_route_attr { struct net_device *out_dev; diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c b/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c -index 78538a1..89a98ed 100644 +index 3aa8d0b83d10..8ca1db84ca21 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c @@ -67,8 +67,8 @@ @@ -74,12 +74,12 @@ index 78538a1..89a98ed 100644 +#include "lag/mp.h" #define nic_chains(priv) ((priv)->fs.tc.chains) - + #define MLX5_MH_ACT_SZ MLX5_UN_SZ_BYTES(set_add_copy_action_in_auto) diff --git a/drivers/net/ethernet/mellanox/mlx5/core/lag.c b/drivers/net/ethernet/mellanox/mlx5/core/lag/lag.c similarity index 99% rename from drivers/net/ethernet/mellanox/mlx5/core/lag.c rename to drivers/net/ethernet/mellanox/mlx5/core/lag/lag.c -index 5f8b7f3..fa8b7c7 100644 +index 57d86d47ec2a..ce41d766e417 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/lag.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/lag/lag.c @@ -38,7 +38,7 @@ @@ -95,7 +95,7 @@ diff --git a/drivers/net/ethernet/mellanox/mlx5/core/lag.h b/drivers/net/etherne similarity index 98% rename from drivers/net/ethernet/mellanox/mlx5/core/lag.h rename to drivers/net/ethernet/mellanox/mlx5/core/lag/lag.h -index d4bae52..c268663 100644 +index d4bae528954e..c268663c89b4 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/lag.h +++ b/drivers/net/ethernet/mellanox/mlx5/core/lag/lag.h @@ -5,7 +5,7 @@ @@ -111,7 +111,7 @@ diff --git a/drivers/net/ethernet/mellanox/mlx5/core/lag_mp.c b/drivers/net/ethe similarity index 99% rename from drivers/net/ethernet/mellanox/mlx5/core/lag_mp.c rename to drivers/net/ethernet/mellanox/mlx5/core/lag/mp.c -index 81786a9..17967ed 100644 +index 81786a9a424c..17967ed405d8 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/lag_mp.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/lag/mp.c @@ -4,7 +4,7 @@ @@ -128,5 +128,5 @@ similarity index 100% rename from drivers/net/ethernet/mellanox/mlx5/core/lag_mp.h rename to drivers/net/ethernet/mellanox/mlx5/core/lag/mp.h -- -2.34.1 +2.25.1 diff --git a/SPECS/kernel-hci/config b/SPECS/kernel-hci/config index 5884b16666..70eca3d3b5 100644 --- a/SPECS/kernel-hci/config +++ b/SPECS/kernel-hci/config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86_64 5.15.145.1 Kernel Configuration +# Linux/x86_64 5.15.139.1 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 11.2.0" CONFIG_CC_IS_GCC=y diff --git a/SPECS/kernel-hci/kernel-hci.signatures.json b/SPECS/kernel-hci/kernel-hci.signatures.json index 527b4b1b55..c6c4979e61 100644 --- a/SPECS/kernel-hci/kernel-hci.signatures.json +++ b/SPECS/kernel-hci/kernel-hci.signatures.json @@ -1,7 +1,7 @@ { "Signatures": { "cbl-mariner-ca-20211013.pem": "5ef124b0924cb1047c111a0ecff1ae11e6ad7cac8d1d9b40f98f99334121f0b0", - "config": "f7b7d042fa6cce9f86de9f6ecb655873ebba99e4dbc91558191b38e125915f0d", - "kernel-5.15.145.1.tar.gz": "6091e2b225ce3f9e9ea1ba76b1e49978567ecc59b24135cc5081ecf6d464662e" + "config": "b3dc3eafbbb4670e50adc73066644e2274c4801117f4e6109970c6dd45494e32", + "kernel-5.15.139.1.tar.gz": "7dc657637a9ef4d2491eeae364e6ab0132ea4db3b1a9db7c2601eaf009200459" } } \ No newline at end of file diff --git a/SPECS/kernel-hci/kernel-hci.spec b/SPECS/kernel-hci/kernel-hci.spec index 89347de020..ad705737a0 100644 --- a/SPECS/kernel-hci/kernel-hci.spec +++ b/SPECS/kernel-hci/kernel-hci.spec @@ -17,7 +17,7 @@ %define config_source %{SOURCE1} Summary: Linux Kernel for HCI Name: kernel-hci -Version: 5.15.145.1 +Version: 5.15.139.1 Release: 1%{?dist} License: GPLv2 Vendor: Microsoft Corporation @@ -435,13 +435,6 @@ ln -sf linux-%{uname_r}.cfg /boot/mariner.cfg %{_sysconfdir}/bash_completion.d/bpftool %changelog -* Wed Jan 03 2024 CBL-Mariner Servicing Account - 5.15.145.1-1 -- Auto-upgrade to 5.15.145.1 - -* Tue Dec 19 2023 CBL-Mariner Servicing Account - 5.15.143.1-1 -- Auto-upgrade to 5.15.143.1 -- Fix 0005-net-mlx5-Lag-move-lag-files-into-directory.patch so patch applies after update - * Tue Dec 05 2023 CBL-Mariner Servicing Account - 5.15.139.1-1 - Auto-upgrade to 5.15.139.1 diff --git a/SPECS/kernel-headers/kernel-headers.signatures.json b/SPECS/kernel-headers/kernel-headers.signatures.json index 48643edb8b..73ca80e43f 100644 --- a/SPECS/kernel-headers/kernel-headers.signatures.json +++ b/SPECS/kernel-headers/kernel-headers.signatures.json @@ -1,5 +1,5 @@ { "Signatures": { - "kernel-5.15.145.1.tar.gz": "6091e2b225ce3f9e9ea1ba76b1e49978567ecc59b24135cc5081ecf6d464662e" + "kernel-5.15.139.1.tar.gz": "7dc657637a9ef4d2491eeae364e6ab0132ea4db3b1a9db7c2601eaf009200459" } } \ No newline at end of file diff --git a/SPECS/kernel-headers/kernel-headers.spec b/SPECS/kernel-headers/kernel-headers.spec index d1f66b2ec7..82ef0cbe74 100644 --- a/SPECS/kernel-headers/kernel-headers.spec +++ b/SPECS/kernel-headers/kernel-headers.spec @@ -1,6 +1,6 @@ Summary: Linux API header files Name: kernel-headers -Version: 5.15.145.1 +Version: 5.15.139.1 Release: 1%{?dist} License: GPLv2 Vendor: Microsoft Corporation @@ -36,12 +36,6 @@ cp -rv usr/include/* /%{buildroot}%{_includedir} %{_includedir}/* %changelog -* Wed Jan 03 2024 CBL-Mariner Servicing Account - 5.15.145.1-1 -- Auto-upgrade to 5.15.145.1 - -* Tue Dec 19 2023 CBL-Mariner Servicing Account - 5.15.143.1-1 -- Auto-upgrade to 5.15.143.1 - * Tue Dec 05 2023 CBL-Mariner Servicing Account - 5.15.139.1-1 - Auto-upgrade to 5.15.139.1 diff --git a/SPECS/kernel/CVE-2023-46862.nopatch b/SPECS/kernel/CVE-2023-46862.nopatch deleted file mode 100644 index a0b4ccecde..0000000000 --- a/SPECS/kernel/CVE-2023-46862.nopatch +++ /dev/null @@ -1,3 +0,0 @@ -CVE-2023-46862 - patched in 5.15.140.1 - (generated by autopatch tool) -upstream 7644b1a1c9a7ae8ab99175989bfc8676055edb46 - stable 3d7912710e5e187217313fea5c145881cfeaf952 - diff --git a/SPECS/kernel/CVE-2023-6546.nopatch b/SPECS/kernel/CVE-2023-6546.nopatch deleted file mode 100644 index 44bf865eb5..0000000000 --- a/SPECS/kernel/CVE-2023-6546.nopatch +++ /dev/null @@ -1,3 +0,0 @@ -CVE-2023-6546 - patched in 5.15.128.1 - (generated by autopatch tool) -upstream 3c4f8333b582487a2d1e02171f1465531cde53e3 - stable 2a523446438376bb7c224f3169ae9b98ce0fb893 - diff --git a/SPECS/kernel/CVE-2023-6622.nopatch b/SPECS/kernel/CVE-2023-6622.nopatch deleted file mode 100644 index 81f06c2032..0000000000 --- a/SPECS/kernel/CVE-2023-6622.nopatch +++ /dev/null @@ -1,3 +0,0 @@ -CVE-2023-6622 - patched in 5.15.143.1 - (generated by autopatch tool) -upstream 3701cd390fd731ee7ae8b8006246c8db82c72bea - stable cf5f113c41eb2c7dbe19d849a0883f7a429fa54b - diff --git a/SPECS/kernel/CVE-2023-6931.nopatch b/SPECS/kernel/CVE-2023-6931.nopatch deleted file mode 100644 index 26ab12fcd4..0000000000 --- a/SPECS/kernel/CVE-2023-6931.nopatch +++ /dev/null @@ -1,2 +0,0 @@ -CVE-2023-6931 - patched in 5.15.143.1 -upstream commit ID 382c27f4ed28f803b1f1473ac2d8db0afc795a1b -> stable commit ID ebc7597ce9719d2ff72e13df072680aa491f27fb diff --git a/SPECS/kernel/CVE-2023-6932.nopatch b/SPECS/kernel/CVE-2023-6932.nopatch deleted file mode 100644 index 47b66704bb..0000000000 --- a/SPECS/kernel/CVE-2023-6932.nopatch +++ /dev/null @@ -1,3 +0,0 @@ -CVE-2023-6932 - patched in 5.15.142.1 - (generated by autopatch tool) -upstream e2b706c691905fe78468c361aaabc719d0a496f1 - stable c4a00c47a140c39a0497a40b0f54cf4586a2b1d7 - diff --git a/SPECS/kernel/config b/SPECS/kernel/config index 815a7627a6..8dcfe12a07 100644 --- a/SPECS/kernel/config +++ b/SPECS/kernel/config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86_64 5.15.145.1 Kernel Configuration +# Linux/x86_64 5.15.139.1 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 11.2.0" CONFIG_CC_IS_GCC=y diff --git a/SPECS/kernel/config_aarch64 b/SPECS/kernel/config_aarch64 index 6ab6c741d4..0a08e56294 100644 --- a/SPECS/kernel/config_aarch64 +++ b/SPECS/kernel/config_aarch64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 5.15.145.1 Kernel Configuration +# Linux/arm64 5.15.139.1 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 11.2.0" CONFIG_CC_IS_GCC=y @@ -3387,6 +3387,7 @@ CONFIG_DWMAC_ROCKCHIP=m CONFIG_DWMAC_SUN8I=m CONFIG_DWMAC_IMX8=m # CONFIG_DWMAC_INTEL_PLAT is not set +# CONFIG_DWMAC_LOONGSON is not set # CONFIG_STMMAC_PCI is not set CONFIG_NET_VENDOR_SUN=y CONFIG_HAPPYMEAL=m diff --git a/SPECS/kernel/kernel.signatures.json b/SPECS/kernel/kernel.signatures.json index de18e65b5c..4bce38410c 100644 --- a/SPECS/kernel/kernel.signatures.json +++ b/SPECS/kernel/kernel.signatures.json @@ -1,9 +1,9 @@ { "Signatures": { "cbl-mariner-ca-20211013.pem": "5ef124b0924cb1047c111a0ecff1ae11e6ad7cac8d1d9b40f98f99334121f0b0", - "config": "a41b91d4b9d986d949fe0120e2a8c1cc81d58ea797da03504635e25e2d796236", - "config_aarch64": "c9ef6f681c0e9ef7a9a771c48c796f314e97f4f3827fc1ab15e0262650b0f2fd", + "config": "652e816787b588f1a24c8ac09c56a1ef7a53f017e9ccbde7680f0628a381a78e", + "config_aarch64": "49028e6fba0e0f4951caef3c8c457b666cb584b6fd1b2043f756ca810387d37e", "sha512hmac-openssl.sh": "02ab91329c4be09ee66d759e4d23ac875037c3b56e5a598e32fd1206da06a27f", - "kernel-5.15.145.1.tar.gz": "6091e2b225ce3f9e9ea1ba76b1e49978567ecc59b24135cc5081ecf6d464662e" + "kernel-5.15.139.1.tar.gz": "7dc657637a9ef4d2491eeae364e6ab0132ea4db3b1a9db7c2601eaf009200459" } } \ No newline at end of file diff --git a/SPECS/kernel/kernel.spec b/SPECS/kernel/kernel.spec index 3af7b167f4..6a04349520 100644 --- a/SPECS/kernel/kernel.spec +++ b/SPECS/kernel/kernel.spec @@ -27,7 +27,7 @@ Summary: Linux Kernel Name: kernel -Version: 5.15.145.1 +Version: 5.15.139.1 Release: 1%{?dist} License: GPLv2 Vendor: Microsoft Corporation @@ -426,12 +426,6 @@ ln -sf linux-%{uname_r}.cfg /boot/mariner.cfg %{_sysconfdir}/bash_completion.d/bpftool %changelog -* Wed Jan 03 2024 CBL-Mariner Servicing Account - 5.15.145.1-1 -- Auto-upgrade to 5.15.145.1 - -* Tue Dec 19 2023 CBL-Mariner Servicing Account - 5.15.143.1-1 -- Auto-upgrade to 5.15.143.1 - * Tue Dec 05 2023 CBL-Mariner Servicing Account - 5.15.139.1-1 - Auto-upgrade to 5.15.139.1 diff --git a/cgmanifest.json b/cgmanifest.json index 0e048730ea..a62b333ec0 100644 --- a/cgmanifest.json +++ b/cgmanifest.json @@ -6540,8 +6540,8 @@ "type": "other", "other": { "name": "hyperv-daemons", - "version": "5.15.145.1", - "downloadUrl": "https://github.com/microsoft/CBL-Mariner-Linux-Kernel/archive/rolling-lts/mariner-2/5.15.145.1.tar.gz" + "version": "5.15.139.1", + "downloadUrl": "https://github.com/microsoft/CBL-Mariner-Linux-Kernel/archive/rolling-lts/mariner-2/5.15.139.1.tar.gz" } } }, @@ -8121,8 +8121,8 @@ "type": "other", "other": { "name": "kernel", - "version": "5.15.145.1", - "downloadUrl": "https://github.com/microsoft/CBL-Mariner-Linux-Kernel/archive/rolling-lts/mariner-2/5.15.145.1.tar.gz" + "version": "5.15.139.1", + "downloadUrl": "https://github.com/microsoft/CBL-Mariner-Linux-Kernel/archive/rolling-lts/mariner-2/5.15.139.1.tar.gz" } } }, @@ -8131,8 +8131,8 @@ "type": "other", "other": { "name": "kernel-azure", - "version": "5.15.145.1", - "downloadUrl": "https://github.com/microsoft/CBL-Mariner-Linux-Kernel/archive/rolling-lts/mariner-2/5.15.145.1.tar.gz" + "version": "5.15.139.1", + "downloadUrl": "https://github.com/microsoft/CBL-Mariner-Linux-Kernel/archive/rolling-lts/mariner-2/5.15.139.1.tar.gz" } } }, @@ -8141,8 +8141,8 @@ "type": "other", "other": { "name": "kernel-hci", - "version": "5.15.145.1", - "downloadUrl": "https://github.com/microsoft/CBL-Mariner-Linux-Kernel/archive/rolling-lts/mariner-2/5.15.145.1.tar.gz" + "version": "5.15.139.1", + "downloadUrl": "https://github.com/microsoft/CBL-Mariner-Linux-Kernel/archive/rolling-lts/mariner-2/5.15.139.1.tar.gz" } } }, @@ -8151,8 +8151,8 @@ "type": "other", "other": { "name": "kernel-headers", - "version": "5.15.145.1", - "downloadUrl": "https://github.com/microsoft/CBL-Mariner-Linux-Kernel/archive/rolling-lts/mariner-2/5.15.145.1.tar.gz" + "version": "5.15.139.1", + "downloadUrl": "https://github.com/microsoft/CBL-Mariner-Linux-Kernel/archive/rolling-lts/mariner-2/5.15.139.1.tar.gz" } } }, @@ -30937,4 +30937,4 @@ } ], "Version": 1 -} \ No newline at end of file +} diff --git a/toolkit/resources/manifests/package/pkggen_core_aarch64.txt b/toolkit/resources/manifests/package/pkggen_core_aarch64.txt index dd2afac690..1beb1939a3 100644 --- a/toolkit/resources/manifests/package/pkggen_core_aarch64.txt +++ b/toolkit/resources/manifests/package/pkggen_core_aarch64.txt @@ -1,5 +1,5 @@ filesystem-1.1-19.cm2.aarch64.rpm -kernel-headers-5.15.145.1-1.cm2.noarch.rpm +kernel-headers-5.15.139.1-1.cm2.noarch.rpm glibc-2.35-6.cm2.aarch64.rpm glibc-devel-2.35-6.cm2.aarch64.rpm glibc-i18n-2.35-6.cm2.aarch64.rpm diff --git a/toolkit/resources/manifests/package/pkggen_core_x86_64.txt b/toolkit/resources/manifests/package/pkggen_core_x86_64.txt index 74788d11a7..a25fcd6974 100644 --- a/toolkit/resources/manifests/package/pkggen_core_x86_64.txt +++ b/toolkit/resources/manifests/package/pkggen_core_x86_64.txt @@ -1,5 +1,5 @@ filesystem-1.1-19.cm2.x86_64.rpm -kernel-headers-5.15.145.1-1.cm2.noarch.rpm +kernel-headers-5.15.139.1-1.cm2.noarch.rpm glibc-2.35-6.cm2.x86_64.rpm glibc-devel-2.35-6.cm2.x86_64.rpm glibc-i18n-2.35-6.cm2.x86_64.rpm diff --git a/toolkit/resources/manifests/package/toolchain_aarch64.txt b/toolkit/resources/manifests/package/toolchain_aarch64.txt index b4c3bbe1e0..6c540da905 100644 --- a/toolkit/resources/manifests/package/toolchain_aarch64.txt +++ b/toolkit/resources/manifests/package/toolchain_aarch64.txt @@ -136,7 +136,7 @@ intltool-0.51.0-7.cm2.noarch.rpm itstool-2.0.6-4.cm2.noarch.rpm kbd-2.2.0-1.cm2.aarch64.rpm kbd-debuginfo-2.2.0-1.cm2.aarch64.rpm -kernel-headers-5.15.145.1-1.cm2.noarch.rpm +kernel-headers-5.15.139.1-1.cm2.noarch.rpm kmod-29-2.cm2.aarch64.rpm kmod-debuginfo-29-2.cm2.aarch64.rpm kmod-devel-29-2.cm2.aarch64.rpm diff --git a/toolkit/resources/manifests/package/toolchain_x86_64.txt b/toolkit/resources/manifests/package/toolchain_x86_64.txt index 4ce57bbd66..befc9f4752 100644 --- a/toolkit/resources/manifests/package/toolchain_x86_64.txt +++ b/toolkit/resources/manifests/package/toolchain_x86_64.txt @@ -136,7 +136,7 @@ intltool-0.51.0-7.cm2.noarch.rpm itstool-2.0.6-4.cm2.noarch.rpm kbd-2.2.0-1.cm2.x86_64.rpm kbd-debuginfo-2.2.0-1.cm2.x86_64.rpm -kernel-headers-5.15.145.1-1.cm2.noarch.rpm +kernel-headers-5.15.139.1-1.cm2.noarch.rpm kmod-29-2.cm2.x86_64.rpm kmod-debuginfo-29-2.cm2.x86_64.rpm kmod-devel-29-2.cm2.x86_64.rpm