From 28cda67f9b518cb4d4a299bac62be1c3ed3cddda Mon Sep 17 00:00:00 2001
From: Andrey Smirnov <andrey.smirnov@talos-systems.com>
Date: Mon, 27 Sep 2021 16:53:59 +0300
Subject: [PATCH] feat: update Linux kernel to 5.10.69

Latest release in 5.10.x LTS.

Signed-off-by: Andrey Smirnov <andrey.smirnov@talos-systems.com>
---
 containerd/pkg.yaml                            | 4 ++--
 kernel/kernel-prepare/pkg.yaml                 | 6 +++---
 kernel/kernel/config-amd64                     | 2 +-
 kernel/kernel/config-arm64                     | 2 +-
 kernel/kernel/scripts/filter-hardened-check.py | 1 +
 5 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/containerd/pkg.yaml b/containerd/pkg.yaml
index de328094..db3f1a9a 100644
--- a/containerd/pkg.yaml
+++ b/containerd/pkg.yaml
@@ -9,8 +9,8 @@ steps:
         # sync with version and revision in build
       - url: https://github.com/containerd/containerd/archive/refs/tags/v1.5.5.tar.gz
         destination: containerd.tar.gz
-        sha256: 7a04c284066882152e4968c4997b7a0b1c85c0ba549dad66f3911864163646dd
-        sha512: 8ee5aa1d35e76238fd8707bff6b7eedb7931e6489d49b6907a8e190b076fe6fd95ae5e85ecea1605adb7fcd4f3ae0e926696f1d2f3c0d12b61e6df906929b9eb
+        sha256: 3a580cd5f125fd473c10a1ea38178b0f662777144a8cc83d97dba2d2350f2b17
+        sha512: 872f6a02e23900f4f857e9943e66076bd52afb0e449fb7517dd49ed7bb548b3c2b7d903a32eff1ab70c0e37f73eda5001c71dd578d732b3f908bb6842cc0a39e
     prepare:
       - |
         tar -xzf containerd.tar.gz --strip-components=1
diff --git a/kernel/kernel-prepare/pkg.yaml b/kernel/kernel-prepare/pkg.yaml
index 5ad8f7f9..c09d6e45 100644
--- a/kernel/kernel-prepare/pkg.yaml
+++ b/kernel/kernel-prepare/pkg.yaml
@@ -5,10 +5,10 @@ dependencies:
   - image: '{{ .TOOLS_IMAGE }}'
 steps:
   - sources:
-      - url: https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.58.tar.xz
+      - url: https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.69.tar.xz
         destination: linux.tar.xz
-        sha256: 732cc56be539e65894621c3b6b2640597d8cf5da17319b82da6e7b4f7828f210
-        sha512: cbe5a7e9da6c9ce32f76cac0b10456546c69392d14f77f8158f92651c9e0c0d5463df48df07ffa10532ece209f1b8697e83db1965dc4d372a913ee9aadde8681
+        sha256: 232f9ec53bccca768868831b7cc286f7d8bbbac9f481bbac1495700231a20cca
+        sha512: a86a6becdac8359b59647c01048d8cc21316e3bf113df85511e9890ca99b887b2def1e3bf0310bac54a986adeebfa9c76c6c4b9b805183d7e9ae10944fc051e4
     env:
       ARCH: {{ if eq .ARCH "aarch64"}}arm64{{ else if eq .ARCH "x86_64" }}x86_64{{ else }}unsupported{{ end }}
     prepare:
diff --git a/kernel/kernel/config-amd64 b/kernel/kernel/config-amd64
index 373cc90e..11600e00 100644
--- a/kernel/kernel/config-amd64
+++ b/kernel/kernel/config-amd64
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.10.58 Kernel Configuration
+# Linux/x86 5.10.69 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 11.2.0"
 CONFIG_CC_IS_GCC=y
diff --git a/kernel/kernel/config-arm64 b/kernel/kernel/config-arm64
index f4df95c2..8c169026 100644
--- a/kernel/kernel/config-arm64
+++ b/kernel/kernel/config-arm64
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 5.10.58 Kernel Configuration
+# Linux/arm64 5.10.69 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 11.2.0"
 CONFIG_CC_IS_GCC=y
diff --git a/kernel/kernel/scripts/filter-hardened-check.py b/kernel/kernel/scripts/filter-hardened-check.py
index 49b1984a..5f244fef 100644
--- a/kernel/kernel/scripts/filter-hardened-check.py
+++ b/kernel/kernel/scripts/filter-hardened-check.py
@@ -19,6 +19,7 @@
     'CONFIG_HARDEN_BRANCH_PREDICTOR', # looks like a bug in kconfig-hardened-check, default in 5.9, but not enabled in 5.10
     'CONFIG_INIT_ON_FREE_DEFAULT_ON', # disabled init_on_free=1 due to performance
     'CONFIG_ARM64_EPAN', # not available in 5.10, first introduced in 5.13
+    'CONFIG_RANDOMIZE_KSTACK_OFFSET_DEFAULT', # not available in 5.10, first introduced in 5.13
 }
 
 def main():