kernel-6.1: update to 6.1.49

Rebase to Amazon Linux upstream version 6.1.49-69.116.amzn2023. Drop downstream backports of fixes for CVE-2023-20588 as these are now included by the upstream base version. Signed-off-by: Leonard Foerster <[email protected]>
bottlerocket-os · Sep 11, 2023 · 5544b6c · 5544b6c
1 parent 5ef1612
commit 5544b6c
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 251 deletions.
diff --git a/packages/kernel-6.1/5001-x86-bugs-Increase-the-x86-bugs-vector-size-to-two-u3.patch b/packages/kernel-6.1/5001-x86-bugs-Increase-the-x86-bugs-vector-size-to-two-u3.patch
diff --git a/packages/kernel-6.1/5002-x86-CPU-AMD-Do-not-leak-quotient-data-after-a-divisi.patch b/packages/kernel-6.1/5002-x86-CPU-AMD-Do-not-leak-quotient-data-after-a-divisi.patch
diff --git a/packages/kernel-6.1/5003-x86-CPU-AMD-Fix-the-DIV-0-initial-fix-attempt.patch b/packages/kernel-6.1/5003-x86-CPU-AMD-Fix-the-DIV-0-initial-fix-attempt.patch
diff --git a/packages/kernel-6.1/Cargo.toml b/packages/kernel-6.1/Cargo.toml
@@ -14,8 +14,8 @@ path = "../packages.rs"
 
 [[package.metadata.build-package.external-files]]
 # Use latest-srpm-url.sh to get this.
-url = "https://cdn.amazonlinux.com/al2023/blobstore/789848dec5baccf864b022af695a2a3ac1ba52392a2b6aa83f19dc07d050df0a/kernel-6.1.41-63.114.amzn2023.src.rpm"
-sha512 = "6a66562d23a21ac3fba56cb13680ef2cc0c3fe9b2b77e83c3e6da47ca36016413cd5ebac9266419e835d04f10fb509b00536fc3e38eb0e8d707db5f8fdd8f10e"
+url = "https://cdn.amazonlinux.com/al2023/blobstore/b7fd4bb92caacd373bbd4cf41dca8c29736bf229c08ef80c59bb6063654d058b/kernel-6.1.49-69.116.amzn2023.src.rpm"
+sha512 = "d9ccbf828b0466a226a6bf42e9d8a4482b4acea1bd27f6ba28a823d481d6357688a1594b457a6b8735b611d4d370b2aeb1382726ae694bb03f7aa1cf9ee7a9c2"
 
 [build-dependencies]
 microcode = { path = "../microcode" }
diff --git a/packages/kernel-6.1/kernel-6.1.spec b/packages/kernel-6.1/kernel-6.1.spec
@@ -1,13 +1,13 @@
 %global debug_package %{nil}
 
 Name: %{_cross_os}kernel-6.1
-Version: 6.1.41
+Version: 6.1.49
 Release: 1%{?dist}
 Summary: The Linux kernel
 License: GPL-2.0 WITH Linux-syscall-note
 URL: https://www.kernel.org/
 # Use latest-srpm-url.sh to get this.
-Source0: https://cdn.amazonlinux.com/al2023/blobstore/789848dec5baccf864b022af695a2a3ac1ba52392a2b6aa83f19dc07d050df0a/kernel-6.1.41-63.114.amzn2023.src.rpm
+Source0: https://cdn.amazonlinux.com/al2023/blobstore/b7fd4bb92caacd373bbd4cf41dca8c29736bf229c08ef80c59bb6063654d058b/kernel-6.1.49-69.116.amzn2023.src.rpm
 Source100: config-bottlerocket
 Source101: config-bottlerocket-aws
 Source102: config-bottlerocket-metal
@@ -25,12 +25,6 @@ Patch1004: 1004-af_unix-increase-default-max_dgram_qlen-to-512.patch
 # options for nvidia are instead included through DRM_SIMPLE
 Patch1005: 1005-Revert-Revert-drm-fb_helper-improve-CONFIG_FB-depend.patch
 
-# Cherry-picked fixes for CVE-2023-20588 ("DIV0"). Can be dropped when moving
-# upstream to 6.1.48 or later
-Patch5001: 5001-x86-bugs-Increase-the-x86-bugs-vector-size-to-two-u3.patch
-Patch5002: 5002-x86-CPU-AMD-Do-not-leak-quotient-data-after-a-divisi.patch
-Patch5003: 5003-x86-CPU-AMD-Fix-the-DIV-0-initial-fix-attempt.patch
-
 BuildRequires: bc
 BuildRequires: elfutils-devel
 BuildRequires: hostname