From 389f65482ffd4c6ac057e59c454d96ae53fcc042 Mon Sep 17 00:00:00 2001 From: Jiping Ma Date: Tue, 31 Jan 2023 02:53:28 -0500 Subject: [PATCH] Update kernel to v5.10.162 This commit updates kernel to 5.10.162 to fix many issues, including the following CVE issues. CVE-2022-3643: https://nvd.nist.gov/vuln/detail/CVE-2022-3643 CVE-2022-3524: https://nvd.nist.gov/vuln/detail/CVE-2022-3524 Our source patches do not require refresh against the new kernel source. Verification: - Build kernel and out of tree modules success for rt and std. - Build iso success for rt and std. - Install success onto a All-in-One lab with rt kernel. - Boot up successfully in the lab. - The sanity testing was run including kernel and applications by our test team. - The cyclictest benchmark was also run on the starlingx lab, the result is "samples: 259199998 avg: 1628 max: 4387 99.9999th percentile: 2996 overflows: 0", It is not big difference with 5.10.152 for avg and 99.9999th, but max value seems little higher than 5.10.152. Closes-Bug: 2002280 Signed-off-by: Jiping Ma Change-Id: Ib2017625a92f51e02a41a8d14d8ba850f9c0721a --- ...0023-Upgrade-5.10-kernel-to-5.10.162.patch | 30 +++++++++++++++++++ kernel-rt/debian/deb_patches/series | 1 + kernel-rt/debian/dl_hook | 2 +- kernel-rt/debian/meta_data.yaml | 8 ++--- ...0022-Upgrade-5.10-kernel-to-5.10.162.patch | 30 +++++++++++++++++++ kernel-std/debian/deb_patches/series | 1 + kernel-std/debian/dl_hook | 2 +- kernel-std/debian/meta_data.yaml | 8 ++--- 8 files changed, 72 insertions(+), 10 deletions(-) create mode 100644 kernel-rt/debian/deb_patches/0023-Upgrade-5.10-kernel-to-5.10.162.patch create mode 100644 kernel-std/debian/deb_patches/0022-Upgrade-5.10-kernel-to-5.10.162.patch diff --git a/kernel-rt/debian/deb_patches/0023-Upgrade-5.10-kernel-to-5.10.162.patch b/kernel-rt/debian/deb_patches/0023-Upgrade-5.10-kernel-to-5.10.162.patch new file mode 100644 index 00000000..ad20549f --- /dev/null +++ b/kernel-rt/debian/deb_patches/0023-Upgrade-5.10-kernel-to-5.10.162.patch @@ -0,0 +1,30 @@ +From 3e9ef26598b541770669434a2be77b0384fe1153 Mon Sep 17 00:00:00 2001 +From: Jiping Ma +Date: Tue, 10 Jan 2023 18:57:01 -0800 +Subject: [PATCH] Upgrade 5.10 kernel to 5.10.162 + +Update debian/changelog. + +Signed-off-by: Jiping Ma +--- + debian/changelog | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/debian/changelog b/debian/changelog +index 1855b1f..cb77ab5 100644 +--- a/debian/changelog ++++ b/debian/changelog +@@ -1,3 +1,10 @@ ++linux-rt (5.10.162-1) unstable; urgency=medium ++ ++ * New upstream update: ++ https://git.yoctoproject.org/linux-yocto/log/?h=v5.10%2Fstandard%2Fpreempt-rt%2Fbase&qt=range&q=58d7abb88dadc31a3bdcaabc324ae015d77642b7 ++ ++ -- Jiping Ma Wed Jan 11 10:56:12 CST 2023 ++ + linux-rt (5.10.152-1) unstable; urgency=medium + + * New upstream update: +-- +2.39.0 + diff --git a/kernel-rt/debian/deb_patches/series b/kernel-rt/debian/deb_patches/series index 31b1132a..cd5bd756 100644 --- a/kernel-rt/debian/deb_patches/series +++ b/kernel-rt/debian/deb_patches/series @@ -20,3 +20,4 @@ 0020-Upgrade-5.10-kernel-to-5.10.152.patch 0021-kernel-rt-unset-LOCK_DOWN_IN_EFI_SECURE_BOOT.patch 0022-config-don-t-unset-CONFIG_EFIVAR_FS.patch +0023-Upgrade-5.10-kernel-to-5.10.162.patch diff --git a/kernel-rt/debian/dl_hook b/kernel-rt/debian/dl_hook index ac9ea950..0b1265d8 100755 --- a/kernel-rt/debian/dl_hook +++ b/kernel-rt/debian/dl_hook @@ -24,7 +24,7 @@ # building. # Tools needed: tar/sed -KERNEL_HEAD_COMMIT=899cf349eab4ac3020c6bad06f889e679509a1d2 +KERNEL_HEAD_COMMIT=58d7abb88dadc31a3bdcaabc324ae015d77642b7 DEBIAN_FILE=linux_5.10.28-1.debian.tar.xz tar xvf linux-yocto-${KERNEL_HEAD_COMMIT}.tar.gz diff --git a/kernel-rt/debian/meta_data.yaml b/kernel-rt/debian/meta_data.yaml index f4546a7d..d98dfb23 100644 --- a/kernel-rt/debian/meta_data.yaml +++ b/kernel-rt/debian/meta_data.yaml @@ -1,14 +1,14 @@ --- -debver: 5.10.152 +debver: 5.10.162 debname: linux-rt dl_hook: dl_hook dl_files: - linux-yocto-899cf349eab4ac3020c6bad06f889e679509a1d2.tar.gz: + linux-yocto-58d7abb88dadc31a3bdcaabc324ae015d77642b7.tar.gz: topdir: null url: "https://git.yoctoproject.org/linux-yocto/snapshot/\ - linux-yocto-899cf349eab4ac3020c6bad06f889e679509a1d2.tar.gz" - sha256sum: 40e615468edd0ef7a5b3f841fb273c7d9327a6ea9efefac6e395833e5256173b + linux-yocto-58d7abb88dadc31a3bdcaabc324ae015d77642b7.tar.gz" + sha256sum: 490eb16d9482f08a535cf520e956c972c320863af57b9beb28e3acbc078ef370 linux_5.10.28-1.debian.tar.xz: topdir: null url: diff --git a/kernel-std/debian/deb_patches/0022-Upgrade-5.10-kernel-to-5.10.162.patch b/kernel-std/debian/deb_patches/0022-Upgrade-5.10-kernel-to-5.10.162.patch new file mode 100644 index 00000000..1dbb5edc --- /dev/null +++ b/kernel-std/debian/deb_patches/0022-Upgrade-5.10-kernel-to-5.10.162.patch @@ -0,0 +1,30 @@ +From 9cfd878bd84176100aeea797ef6d8e3a32f24d0e Mon Sep 17 00:00:00 2001 +From: Jiping Ma +Date: Tue, 10 Jan 2023 17:32:23 -0800 +Subject: [PATCH] Upgrade 5.10 kernel to 5.10.162 + +Update debian/changelog. + +Signed-off-by: Jiping Ma +--- + debian/changelog | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/debian/changelog b/debian/changelog +index 7e89a53..aa02f67 100644 +--- a/debian/changelog ++++ b/debian/changelog +@@ -1,3 +1,10 @@ ++linux (5.10.162-1) unstable; urgency=medium ++ ++ * New upstream update: ++ https://git.yoctoproject.org/linux-yocto/log/?h=v5.10%2Fstandard%2Fbase&qt=range&q=353f388471e281c0f387436b035bfdcd2f468505 ++ ++ -- Jiping Ma Wed Jan 11 9:33:12 CST 2023 ++ + linux (5.10.152-1) unstable; urgency=medium + + * New upstream update: +-- +2.39.0 + diff --git a/kernel-std/debian/deb_patches/series b/kernel-std/debian/deb_patches/series index 67619d03..49e1afb3 100644 --- a/kernel-std/debian/deb_patches/series +++ b/kernel-std/debian/deb_patches/series @@ -19,3 +19,4 @@ 0019-Upgrade-5.10-kernel-to-5.10.152.patch 0020-kernel-std-unset-LOCK_DOWN_IN_EFI_SECURE_BOOT.patch 0021-config-don-t-unset-CONFIG_EFIVAR_FS.patch +0022-Upgrade-5.10-kernel-to-5.10.162.patch diff --git a/kernel-std/debian/dl_hook b/kernel-std/debian/dl_hook index 7dd45e15..9af7837d 100755 --- a/kernel-std/debian/dl_hook +++ b/kernel-std/debian/dl_hook @@ -5,7 +5,7 @@ # be put at the same path where this script is located. # Tools needed: tar -KERNEL_HEAD_COMMIT=7d078581c0f754d6cb38b2bf1952925e0460ef84 +KERNEL_HEAD_COMMIT=353f388471e281c0f387436b035bfdcd2f468505 DEBIAN_FILE=linux_5.10.28-1.debian.tar.xz tar xvf linux-yocto-${KERNEL_HEAD_COMMIT}.tar.gz diff --git a/kernel-std/debian/meta_data.yaml b/kernel-std/debian/meta_data.yaml index 4623a11d..667140e0 100644 --- a/kernel-std/debian/meta_data.yaml +++ b/kernel-std/debian/meta_data.yaml @@ -1,14 +1,14 @@ --- -debver: 5.10.152 +debver: 5.10.162 debname: linux dl_hook: dl_hook dl_files: - linux-yocto-7d078581c0f754d6cb38b2bf1952925e0460ef84.tar.gz: + linux-yocto-353f388471e281c0f387436b035bfdcd2f468505.tar.gz: topdir: null url: "https://git.yoctoproject.org/linux-yocto/snapshot/\ - linux-yocto-7d078581c0f754d6cb38b2bf1952925e0460ef84.tar.gz" - sha256sum: 039933e08504504a4484de030a4f1a2e9bbcd8d8e18c6766fae523d84ec4423e + linux-yocto-353f388471e281c0f387436b035bfdcd2f468505.tar.gz" + sha256sum: b7e3cd44c7dae21f3c718fbe8b25f93a5a360dbda34d8f66b15c9612e8743bd0 linux_5.10.28-1.debian.tar.xz: topdir: null url: