From 92d94906577aa22e42e7d8315fb52621a35c9f8d Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Thu, 15 Aug 2024 07:12:55 +0000 Subject: [PATCH 1/3] sys-kernel/coreos-sources: Update from 6.6.43 to 6.6.46 --- changelog/updates/2024-08-15-linux-6.6.46-update.md | 1 + ...{coreos-kernel-6.6.43.ebuild => coreos-kernel-6.6.46.ebuild} | 0 ...oreos-modules-6.6.43.ebuild => coreos-modules-6.6.46.ebuild} | 0 .../coreos-overlay/sys-kernel/coreos-sources/Manifest | 2 +- ...oreos-sources-6.6.43.ebuild => coreos-sources-6.6.46.ebuild} | 0 5 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 changelog/updates/2024-08-15-linux-6.6.46-update.md rename sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/{coreos-kernel-6.6.43.ebuild => coreos-kernel-6.6.46.ebuild} (100%) rename sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/{coreos-modules-6.6.43.ebuild => coreos-modules-6.6.46.ebuild} (100%) rename sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/{coreos-sources-6.6.43.ebuild => coreos-sources-6.6.46.ebuild} (100%) diff --git a/changelog/updates/2024-08-15-linux-6.6.46-update.md b/changelog/updates/2024-08-15-linux-6.6.46-update.md new file mode 100644 index 00000000000..64c45722ad8 --- /dev/null +++ b/changelog/updates/2024-08-15-linux-6.6.46-update.md @@ -0,0 +1 @@ +- Linux ([6.6.46](https://lwn.net/Articles/985672) (includes [6.6.45](https://lwn.net/Articles/985200), [6.6.44](https://lwn.net/Articles/984450))) diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-6.6.43.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-6.6.46.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-6.6.43.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-6.6.46.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/coreos-modules-6.6.43.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/coreos-modules-6.6.46.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/coreos-modules-6.6.43.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/coreos-modules-6.6.46.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/Manifest b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/Manifest index 556c9687550..1973fd28628 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/Manifest +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/Manifest @@ -1,2 +1,2 @@ DIST linux-6.6.tar.xz 140064536 BLAKE2B 5f02fd8696d42f7ec8c5fbadec8e7270bdcfcb1f9844a6c4db3e1fd461c93ce1ccda650ca72dceb4890ebcbbf768ba8fba0bce91efc49fbd2c307b04e95665f2 SHA512 458b2c34d46206f9b4ccbac54cc57aeca1eaecaf831bc441e59701bac6eadffc17f6ce24af6eadd0454964e843186539ac0d63295ad2cc32d112b60360c39a35 -DIST patch-6.6.43.xz 2470884 BLAKE2B 9529efc4c575df9df7d1463894ceec4d4ccdfa5401ac7ee6109bf5a5c079206073c66ff796dfe0b7308010ed7325123b4e9528c6b8e1cb91a0b7d401b2e53a0d SHA512 693dc595034707ce6992fa0c118f9ef8ba8841f563b89d1d53480485dad1934295c62c39aac83247de91760717a3fef1bbab02c98969e7c6ef934479f7ab604b +DIST patch-6.6.46.xz 2662560 BLAKE2B 049e6cbd7fce4dbb58c5979cf04ba074ef65832c0cee4447075444da538f5ca39ce8ebdf50a12be9a9ff5904a198b92f0847f6ade6e3f3812894d54360aaba96 SHA512 f56fcbcab5f7554a995de56d65068f65c12d257c948949dc2a53075fd4c7de6cd2a85193ce9fc1ab52935c6020867e0a47cbeb8584d8e34c001289ebfbf75e34 diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-6.6.43.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-6.6.46.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-6.6.43.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-6.6.46.ebuild From 9912a5e36257b974097c2c7a7212ed74fb4009a8 Mon Sep 17 00:00:00 2001 From: Adrian Vladu Date: Fri, 16 Aug 2024 16:28:22 +0000 Subject: [PATCH 2/3] sys-kernel/coreos-sources: update revert pahole flags patch --- .../files/6.6/z0002-revert-pahole-flags.patch | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/6.6/z0002-revert-pahole-flags.patch b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/6.6/z0002-revert-pahole-flags.patch index fcbd2b650c1..2591ecf6e45 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/6.6/z0002-revert-pahole-flags.patch +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/6.6/z0002-revert-pahole-flags.patch @@ -1,18 +1,18 @@ diff --git a/init/Kconfig b/init/Kconfig -index 6d35728b94b2..9ae94bf60971 100644 +index e173364abd6c..cdc35682e03b 100644 --- a/init/Kconfig +++ b/init/Kconfig -@@ -1888,7 +1888,7 @@ config RUST - depends on !MODVERSIONS +@@ -1899,7 +1899,7 @@ config RUST depends on !GCC_PLUGINS depends on !RANDSTRUCT + depends on !SHADOW_CALL_STACK - depends on !DEBUG_INFO_BTF || PAHOLE_HAS_LANG_EXCLUDE + depends on !DEBUG_INFO_BTF help Enables Rust support in the kernel. diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug -index fa307f93fa2e..f18386d4712f 100644 +index da5513cfc125..f2b3aab6d4a1 100644 --- a/lib/Kconfig.debug +++ b/lib/Kconfig.debug @@ -394,15 +394,6 @@ config PAHOLE_HAS_BTF_TAG @@ -29,8 +29,8 @@ index fa307f93fa2e..f18386d4712f 100644 - using DEBUG_INFO_BTF_MODULES. - config DEBUG_INFO_BTF_MODULES - def_bool y - depends on DEBUG_INFO_BTF && MODULES && PAHOLE_HAS_SPLIT_BTF + bool "Generate BTF type information for kernel modules" + default y diff --git a/scripts/pahole-flags.sh b/scripts/pahole-flags.sh index 728d55190d97..c293941612e7 100755 --- a/scripts/pahole-flags.sh From 0d487a1900bd5aba2709fbd5981b171746cfd3ce Mon Sep 17 00:00:00 2001 From: Adrian Vladu Date: Fri, 16 Aug 2024 16:30:19 +0000 Subject: [PATCH 3/3] sys-kernel/coreos-sources: changelog: add 6.6.46 kernel version fix for CVE-2024-42258 --- changelog/security/2024-08-16-linux.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 changelog/security/2024-08-16-linux.md diff --git a/changelog/security/2024-08-16-linux.md b/changelog/security/2024-08-16-linux.md new file mode 100644 index 00000000000..01805f26bd6 --- /dev/null +++ b/changelog/security/2024-08-16-linux.md @@ -0,0 +1 @@ +- Linux ([CVE-2024-42259](https://nvd.nist.gov/vuln/detail/CVE-2024-42259))