From 4a4636b54448fbee76cc6cdfe96d429495f92928 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Mon, 17 Jul 2023 18:31:41 +0200
Subject: [PATCH 1/3] linux_rt_5_4: remove now-applied patch

Failing Hydra build: https://hydra.nixos.org/build/226948220/
---
 pkgs/top-level/linux-kernels.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix
index d0710f6ef363..8e144eac1204 100644
--- a/pkgs/top-level/linux-kernels.nix
+++ b/pkgs/top-level/linux-kernels.nix
@@ -127,7 +127,6 @@ in {
       kernelPatches = [
         kernelPatches.bridge_stp_helper
         kernelPatches.request_key_helper
-        kernelPatches.CVE-2023-32233
       ];
     };
 

From 10ff0a076bdb4ba3138cc69e39f38e6e577c4d1d Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Mon, 17 Jul 2023 18:32:06 +0200
Subject: [PATCH 2/3] nixos/tests/kernel-generic: also expose rt kernels and
 linux_libre

---
 nixos/tests/kernel-generic.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/nixos/tests/kernel-generic.nix b/nixos/tests/kernel-generic.nix
index 76deb0f0aa1d..47b5ccb68cc6 100644
--- a/nixos/tests/kernel-generic.nix
+++ b/nixos/tests/kernel-generic.nix
@@ -9,7 +9,7 @@ let
   testsForLinuxPackages = linuxPackages: (import ./make-test-python.nix ({ pkgs, ... }: {
     name = "kernel-${linuxPackages.kernel.version}";
     meta = with pkgs.lib.maintainers; {
-      maintainers = [ nequissimus atemu ];
+      maintainers = [ nequissimus atemu ma27 ];
     };
 
     nodes.machine = { ... }:
@@ -33,6 +33,11 @@ let
       linux_6_1_hardened
       linux_6_3_hardened
       linux_6_4_hardened
+      linux_rt_5_4
+      linux_rt_5_10
+      linux_rt_5_15
+      linux_rt_6_1
+      linux_libre
 
       linux_testing;
   };

From 456c0392a0ebbf16b4cca1f63570c47d87de6ccf Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Mon, 17 Jul 2023 18:48:19 +0200
Subject: [PATCH 3/3] linux/patches: drop obsolete CVE-2023-32233 patch

Part of all upstream source-trees kernels we currently build.
---
 pkgs/os-specific/linux/kernel/patches.nix | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index 972235c7f852..f941ca9f007a 100644
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@@ -57,13 +57,4 @@
     name = "export-rt-sched-migrate";
     patch = ./export-rt-sched-migrate.patch;
   };
-
-  CVE-2023-32233 = rec {
-    name = "CVE-2023-32233";
-    patch = fetchpatch {
-      name = name + ".patch";
-      url = "https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/patch/?id=c1592a89942e9678f7d9c8030efa777c0d57edab";
-      hash = "sha256-DYPWgraXPNeFkjtuDYkFXHnCJ4yDewrukM2CCAqC2BE=";
-    };
-  };
 }