From 731bccc64cdfe456a0cae585da2dc2526158fa5c Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Thu, 11 May 2023 16:47:09 -0400 Subject: [PATCH 01/14] linux: 5.15.110 -> 5.15.111 --- pkgs/os-specific/linux/kernel/linux-5.15.nix | 4 ++-- pkgs/top-level/linux-kernels.nix | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.15.nix b/pkgs/os-specific/linux/kernel/linux-5.15.nix index 64f8c167cc6c..dea4afa70103 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.15.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.15.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.15.110"; + version = "5.15.111"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = versions.pad 3 version; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "0nqbhgafl513pdfn55j608829bsw8kn0v616gblxqy4rgg3zqacq"; + sha256 = "1hmfvii77w70dx1lsfigc7nmjblvs1q131q48didsn01khjymkkp"; }; } // (args.argsOverride or { })) diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index ddf588b5a277..f573f23ee3bf 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -158,7 +158,6 @@ in { kernelPatches.bridge_stp_helper kernelPatches.request_key_helper kernelPatches.fix-em-ice-bonding - kernelPatches.CVE-2023-32233 ]; }; From 4ac78fce347512dbbe48e3d91bd863434a50c832 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Thu, 11 May 2023 16:47:11 -0400 Subject: [PATCH 02/14] linux: 6.1.27 -> 6.1.28 --- pkgs/os-specific/linux/kernel/linux-6.1.nix | 4 ++-- pkgs/top-level/linux-kernels.nix | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-6.1.nix b/pkgs/os-specific/linux/kernel/linux-6.1.nix index 9b9c772b6435..17c51437e712 100644 --- a/pkgs/os-specific/linux/kernel/linux-6.1.nix +++ b/pkgs/os-specific/linux/kernel/linux-6.1.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "6.1.27"; + version = "6.1.28"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = versions.pad 3 version; @@ -13,7 +13,7 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v6.x/linux-${version}.tar.xz"; - sha256 = "01grx5y48scyyihpj176knn5yvgpxv2gfkli03rwj31xvnb4pdy2"; + sha256 = "1w56qgf1vgk3dmh4xw6699kjm5pdqvyfzr19ah5yy3xj50a4q2bs"; }; # TODO: possible to remove after any rebuild, e.g. after update. extraConfig = lib.optionalString (buildPackages.stdenv.system == "x86_64-linux") "\n"; diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index f573f23ee3bf..55db1c285038 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -174,7 +174,6 @@ in { kernelPatches.bridge_stp_helper kernelPatches.request_key_helper kernelPatches.fix-em-ice-bonding - kernelPatches.CVE-2023-32233 ]; }; From 92bc06ec477f5e67cf70b6ec01a34accd3ea5d9a Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Thu, 11 May 2023 16:47:13 -0400 Subject: [PATCH 03/14] linux: 6.2.14 -> 6.2.15 --- pkgs/os-specific/linux/kernel/linux-6.2.nix | 4 ++-- pkgs/top-level/linux-kernels.nix | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-6.2.nix b/pkgs/os-specific/linux/kernel/linux-6.2.nix index 2756beace079..9c20adac9fe8 100644 --- a/pkgs/os-specific/linux/kernel/linux-6.2.nix +++ b/pkgs/os-specific/linux/kernel/linux-6.2.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "6.2.14"; + version = "6.2.15"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = versions.pad 3 version; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v6.x/linux-${version}.tar.xz"; - sha256 = "0ab756x6baza5wmi0r836g7z0hkvby65g0k6n1sd95nl16irzg0f"; + sha256 = "1hcgxmwp1977wkj2ylxzbfqj5qwjc6czvd9yvdm0qrj422939ylz"; }; } // (args.argsOverride or { })) diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index 55db1c285038..fb558fce75fe 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -192,7 +192,6 @@ in { kernelPatches.bridge_stp_helper kernelPatches.request_key_helper kernelPatches.fix-em-ice-bonding - kernelPatches.CVE-2023-32233 ]; }; From 6e8fd501257a95000670007def74d54ef25b633b Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Thu, 11 May 2023 16:47:16 -0400 Subject: [PATCH 04/14] linux: 6.3.1 -> 6.3.2 --- pkgs/os-specific/linux/kernel/linux-6.3.nix | 4 ++-- pkgs/top-level/linux-kernels.nix | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-6.3.nix b/pkgs/os-specific/linux/kernel/linux-6.3.nix index 4df0241a9d8d..007eed0fa0ac 100644 --- a/pkgs/os-specific/linux/kernel/linux-6.3.nix +++ b/pkgs/os-specific/linux/kernel/linux-6.3.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "6.3.1"; + version = "6.3.2"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = versions.pad 3 version; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v6.x/linux-${version}.tar.xz"; - sha256 = "0aizkgwdmdjrgab67yjfaqcmvfh7wb3b3mdq9qfxpq6mlys0yqkq"; + sha256 = "0a2kki763lrlafh6kf9ca8nxrdrk5043k7vdzy4pjgyahbrfq4mn"; }; } // (args.argsOverride or { })) diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index fb558fce75fe..22181e59b91e 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -200,7 +200,6 @@ in { kernelPatches.bridge_stp_helper kernelPatches.request_key_helper kernelPatches.fix-em-ice-bonding - kernelPatches.CVE-2023-32233 ]; }; From 95f20de5ced2f2ba13c9ed1ee6f99fb0f14c7dce Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Thu, 11 May 2023 16:47:29 -0400 Subject: [PATCH 05/14] linux-rt_5_15: 5.15.107-rt62 -> 5.15.111-rt63 --- pkgs/os-specific/linux/kernel/linux-rt-5.15.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-rt-5.15.nix b/pkgs/os-specific/linux/kernel/linux-rt-5.15.nix index d5d83fb23707..6ffe60b4ee1f 100644 --- a/pkgs/os-specific/linux/kernel/linux-rt-5.15.nix +++ b/pkgs/os-specific/linux/kernel/linux-rt-5.15.nix @@ -6,7 +6,7 @@ , ... } @ args: let - version = "5.15.107-rt62"; # updated by ./update-rt.sh + version = "5.15.111-rt63"; # updated by ./update-rt.sh branch = lib.versions.majorMinor version; kversion = builtins.elemAt (lib.splitString "-" version) 0; in buildLinux (args // { @@ -18,14 +18,14 @@ in buildLinux (args // { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz"; - sha256 = "1a5gqpxmzls5mp4a0cw10ldrps4pvbn19nzfri91ys25j1v0wdqr"; + sha256 = "1hmfvii77w70dx1lsfigc7nmjblvs1q131q48didsn01khjymkkp"; }; kernelPatches = let rt-patch = { name = "rt"; patch = fetchurl { url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz"; - sha256 = "0w7ksdv3xpzqiwfxc007k496ghklblb7kglswxhn7y1yqn6pgqzs"; + sha256 = "1jixgqzyns56804dsjkg9n04mbaqrgwvsbgv5jxi2mip1p8spm8s"; }; }; in [ rt-patch ] ++ kernelPatches; From 33b3c68e17e6ae2a3ba5056f2c8ee2562cd697e4 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Thu, 11 May 2023 16:47:36 -0400 Subject: [PATCH 06/14] linux-rt_5_4: 5.4.230-rt80 -> 5.4.242-rt81 --- pkgs/os-specific/linux/kernel/linux-rt-5.4.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-rt-5.4.nix b/pkgs/os-specific/linux/kernel/linux-rt-5.4.nix index 0bf720edfaa1..821e11802e50 100644 --- a/pkgs/os-specific/linux/kernel/linux-rt-5.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-rt-5.4.nix @@ -6,7 +6,7 @@ , ... } @ args: let - version = "5.4.230-rt80"; # updated by ./update-rt.sh + version = "5.4.242-rt81"; # updated by ./update-rt.sh branch = lib.versions.majorMinor version; kversion = builtins.elemAt (lib.splitString "-" version) 0; in buildLinux (args // { @@ -14,14 +14,14 @@ in buildLinux (args // { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz"; - sha256 = "0bz6hfhsahymys2g9s4nzf862z0zfq4346577cpvf98hrhnd6kx7"; + sha256 = "0a7wfi84p74qsnbj1vamz4qxzp94v054jp1csyfl0blz3knrlbql"; }; kernelPatches = let rt-patch = { name = "rt"; patch = fetchurl { url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz"; - sha256 = "19vcalg76vi66g3rk56ky873276is4r67sz2i4vympjq9bskrwrz"; + sha256 = "1wszhzw9ic018x3jiz8x1ffxxg30wpy4db7hja44b661p9fjm1dc"; }; }; in [ rt-patch ] ++ kernelPatches; From 4f9c561b88d53cabdfb46c7f85fbac71ae08fca1 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Thu, 11 May 2023 16:47:43 -0400 Subject: [PATCH 07/14] linux-rt_6_1: 6.1.19-rt8 -> 6.1.26-rt8 --- pkgs/os-specific/linux/kernel/linux-rt-6.1.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-rt-6.1.nix b/pkgs/os-specific/linux/kernel/linux-rt-6.1.nix index c13857ab28f4..68eb87110561 100644 --- a/pkgs/os-specific/linux/kernel/linux-rt-6.1.nix +++ b/pkgs/os-specific/linux/kernel/linux-rt-6.1.nix @@ -6,7 +6,7 @@ , ... } @ args: let - version = "6.1.19-rt8"; # updated by ./update-rt.sh + version = "6.1.26-rt8"; # updated by ./update-rt.sh branch = lib.versions.majorMinor version; kversion = builtins.elemAt (lib.splitString "-" version) 0; in buildLinux (args // { @@ -18,14 +18,14 @@ in buildLinux (args // { src = fetchurl { url = "mirror://kernel/linux/kernel/v6.x/linux-${kversion}.tar.xz"; - sha256 = "0iw6b9gmhpk6r1asds5kfg6drqvaxy15xicqx9ga873cbxp1r6cy"; + sha256 = "0461ckgh9qm1pj9xyi61cvawqpavn2sb44wjx5g4mmkrm11w3p6z"; }; kernelPatches = let rt-patch = { name = "rt"; patch = fetchurl { url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz"; - sha256 = "1nd3x7rgssf3f9vxsplnp5zg0cbixm9lf6sswlnl6pcvj4adagg1"; + sha256 = "1nwbj6cx2sa74f772wxmm5czd6c8v3s2f6919qri19xpm6kndkda"; }; }; in [ rt-patch ] ++ kernelPatches; From e60e0b2279c3cf6c8192087eddeb7d5d9f4bd74f Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Thu, 11 May 2023 16:48:14 -0400 Subject: [PATCH 08/14] linux/hardened/patches/4.14: 4.14.313-hardened1 -> 4.14.314-hardened1 --- pkgs/os-specific/linux/kernel/hardened/patches.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index ae97f9dd60d1..ad76dff9a844 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -2,12 +2,12 @@ "4.14": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-4.14.313-hardened1.patch", - "sha256": "0qpf9chiydj6dcka1lf6qdx462wq0salxac3kkl32l33karax292", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.313-hardened1/linux-hardened-4.14.313-hardened1.patch" + "name": "linux-hardened-4.14.314-hardened1.patch", + "sha256": "08d0mkkc22apdy0m0z5qkkl4xb8d9is0ip3v8rb47bqybmxx879h", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.314-hardened1/linux-hardened-4.14.314-hardened1.patch" }, - "sha256": "0k2j856niappvkp9m1wxr87xvbwdzdy03mbcj827kmpjd9gdca76", - "version": "4.14.313" + "sha256": "0lwiykv2ci7lrjvvykbiqavzzizdkf8xxqlybixi9l1as7q02v47", + "version": "4.14.314" }, "4.19": { "patch": { From 6dc186b9fdd76dddad8f10aac76615b0c9934ae2 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Thu, 11 May 2023 16:48:16 -0400 Subject: [PATCH 09/14] linux/hardened/patches/4.19: 4.19.281-hardened1 -> 4.19.282-hardened1 --- pkgs/os-specific/linux/kernel/hardened/patches.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index ad76dff9a844..2d278d0d59e1 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -12,12 +12,12 @@ "4.19": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-4.19.281-hardened1.patch", - "sha256": "0qhf0835zwmj0z2654bhyc6zww68g8ng4ghg5ivw2zcfv6yssv17", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.281-hardened1/linux-hardened-4.19.281-hardened1.patch" + "name": "linux-hardened-4.19.282-hardened1.patch", + "sha256": "1zy3hk5aykyw8nngzjb46i6q1i4sll5qhskycdhji9ga3wbl4z97", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.282-hardened1/linux-hardened-4.19.282-hardened1.patch" }, - "sha256": "13nwzsh3h634450k37pxdca5j8vr3qswx7k79bs2999xp2js9pf0", - "version": "4.19.281" + "sha256": "02z20879xl4ya957by1p35vi1a7myzxwiqd9cnvm541sgnci99a3", + "version": "4.19.282" }, "5.10": { "patch": { From c097bab320e334dd9a57d0c92d910e56a8f55de3 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Thu, 11 May 2023 16:48:19 -0400 Subject: [PATCH 10/14] linux/hardened/patches/5.10: 5.10.178-hardened1 -> 5.10.179-hardened1 --- pkgs/os-specific/linux/kernel/hardened/patches.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 2d278d0d59e1..5de4078d9478 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -22,12 +22,12 @@ "5.10": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-5.10.178-hardened1.patch", - "sha256": "142ym9z6c9bcq2hpv2ik6xsjlvyyvw3vx8ggp4a67zwv6apg48v3", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.178-hardened1/linux-hardened-5.10.178-hardened1.patch" + "name": "linux-hardened-5.10.179-hardened1.patch", + "sha256": "0mjfk6b6wvr6646sbl47rhs5jjbmnhfx9wkw44apy92l7mnk983r", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.179-hardened1/linux-hardened-5.10.179-hardened1.patch" }, - "sha256": "1bx8wws9gvksg1c1af29nm03jjz2f5a5sq9hzc00ymjyf7isvkqs", - "version": "5.10.178" + "sha256": "0abylcqbzpxxh45kmvd9i2cig64aajz87j5c8vm3w1ab2mf49g8v", + "version": "5.10.179" }, "5.15": { "patch": { From 696e2c8d0a2dc30137190e82744a8638cc32476a Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Thu, 11 May 2023 16:48:22 -0400 Subject: [PATCH 11/14] linux/hardened/patches/5.15: 5.15.108-hardened1 -> 5.15.110-hardened1 --- pkgs/os-specific/linux/kernel/hardened/patches.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 5de4078d9478..d6d7535cec12 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -32,12 +32,12 @@ "5.15": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-5.15.108-hardened1.patch", - "sha256": "1qfmx640b2s10q3sz0lcn1fsfbhklg8l4bzahrsdq6gkvsy9lyxn", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.108-hardened1/linux-hardened-5.15.108-hardened1.patch" + "name": "linux-hardened-5.15.110-hardened1.patch", + "sha256": "1kfad446bnkmsssvhn5w30v3qi4ysja6vgfa01jzwvlnvzizfy0c", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.110-hardened1/linux-hardened-5.15.110-hardened1.patch" }, - "sha256": "1fj38bvsyr9g89qr8pcjrp0kaq44g301x46gyjibq73gljnnkswb", - "version": "5.15.108" + "sha256": "0nqbhgafl513pdfn55j608829bsw8kn0v616gblxqy4rgg3zqacq", + "version": "5.15.110" }, "5.4": { "patch": { From 22c847258b87785db53acbf2d98d9d20777de551 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Thu, 11 May 2023 16:48:26 -0400 Subject: [PATCH 12/14] linux/hardened/patches/5.4: 5.4.241-hardened1 -> 5.4.242-hardened1 --- pkgs/os-specific/linux/kernel/hardened/patches.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index d6d7535cec12..a0ed19940e05 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -42,12 +42,12 @@ "5.4": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-5.4.241-hardened1.patch", - "sha256": "1nksqvc1ql42v92bfp26yyczvzslzl73mhnfc83j6cayqx8dw59z", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.241-hardened1/linux-hardened-5.4.241-hardened1.patch" + "name": "linux-hardened-5.4.242-hardened1.patch", + "sha256": "1g2szikq3ac3gshvglvda6chirv2al43sq6byach1hg2sddbxsx0", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.242-hardened1/linux-hardened-5.4.242-hardened1.patch" }, - "sha256": "0z7api3qcjrd6w7fva7k6fj4zx17mg5ibn28a6qbgy27dyny1h7z", - "version": "5.4.241" + "sha256": "0a7wfi84p74qsnbj1vamz4qxzp94v054jp1csyfl0blz3knrlbql", + "version": "5.4.242" }, "6.1": { "patch": { From 3743a476a5c5bce74b02af166ed133afde5b0c8e Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Thu, 11 May 2023 16:48:29 -0400 Subject: [PATCH 13/14] linux/hardened/patches/6.1: 6.1.25-hardened1 -> 6.1.27-hardened1 --- pkgs/os-specific/linux/kernel/hardened/patches.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index a0ed19940e05..14bb13c463b2 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -52,11 +52,11 @@ "6.1": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-6.1.25-hardened1.patch", - "sha256": "1s9fx4nznmabg7b19qm7nwhpgdvin4f2gxd8f27zh7anbv9na4x7", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/6.1.25-hardened1/linux-hardened-6.1.25-hardened1.patch" + "name": "linux-hardened-6.1.27-hardened1.patch", + "sha256": "0bg149qx7nwpxhajn6283cfgrp151477xpbl5rqhcfk47w3alnk4", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/6.1.27-hardened1/linux-hardened-6.1.27-hardened1.patch" }, - "sha256": "149h95r5msvqah868zd36y92ls9h41cr1rb5vzinl20mxdn46wnb", - "version": "6.1.25" + "sha256": "01grx5y48scyyihpj176knn5yvgpxv2gfkli03rwj31xvnb4pdy2", + "version": "6.1.27" } } From 99c8d675d2986be0fa262c01b3b6374dcad9da1e Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sat, 13 May 2023 12:51:56 +0200 Subject: [PATCH 14/14] linuxKernels: ensure hardened kernels remain patched against CVE-2023-32233 --- pkgs/top-level/linux-kernels.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index 22181e59b91e..077f6ecb023a 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -54,6 +54,11 @@ let }; kernelPatches = kernel.kernelPatches ++ [ kernelPatches.hardened.${kernel.meta.branch} + ] ++ lib.optionals (lib.versionAtLeast version "5.15") [ + # Needed as long as hardened kernels are behind the first patch release + # containing the fix for CVE-2023-32233. Can most likely be removed after the + # next hardened kernel update. + kernelPatches.CVE-2023-32233 ]; isHardened = true; };