From ff3f5e05c1eca6e8e34ee71af56f112e294615ec Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sat, 11 Mar 2023 21:07:29 +0100 Subject: [PATCH 1/9] linux: 4.14.307 -> 4.14.308 (cherry picked from commit 9e15b24443bdbe400b2335c2b01710450e635a4c) --- pkgs/os-specific/linux/kernel/linux-4.14.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix index 87063f9dd77a..51d6e738c023 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "4.14.307"; + version = "4.14.308"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "00dp0vj9572ig4zsnmhl2a2v5vx40hnjibyifw24x1q6qdaia72f"; + sha256 = "19lkw0izj0i63grzycvz6pdxvih0q7lml0h30zsxzb4vb7yj0v7i"; }; } // (args.argsOverride or {})) From eaed086a3a699bb1654e5c941349d9f73f863253 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sat, 11 Mar 2023 21:07:40 +0100 Subject: [PATCH 2/9] linux: 4.19.275 -> 4.19.276 (cherry picked from commit 26c18b8d2779965fa3cea8d21fece2fd4d3ae5d6) --- pkgs/os-specific/linux/kernel/linux-4.19.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix index 0e0a7ea9ce50..23f1c4ac1678 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.19.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.19.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "4.19.275"; + version = "4.19.276"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "02l6f5y1cbjc9997lmcak5j8dllkzr8q47nqscqsyvz2c2hnzsdg"; + sha256 = "1f8lcd47pba4jfycbbrd8vsqpf038x19rf80g3grzpvsgyaq1k1f"; }; } // (args.argsOverride or {})) From 4c3e1a4eb242790340b83e492c03fd498e34479c Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sat, 11 Mar 2023 21:07:51 +0100 Subject: [PATCH 3/9] linux: 5.10.172 -> 5.10.173 (cherry picked from commit fb6c399020bd844589279bca49bd8fb1003566a7) --- pkgs/os-specific/linux/kernel/linux-5.10.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.10.nix b/pkgs/os-specific/linux/kernel/linux-5.10.nix index 327d24885e6f..40e48a57b3e9 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.10.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.10.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.10.172"; + version = "5.10.173"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "1c9757gma0dksd1ch8pljbsmf586bq66gxqpsv53676z8kivl3gj"; + sha256 = "099w115m2b1l99r4pn7ifjg6aqb8rsn888102qj8iv97qxsb901l"; }; } // (args.argsOverride or {})) From 216c6e2276a3903195d030c7d6a40f5c661a266a Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sat, 11 Mar 2023 21:08:02 +0100 Subject: [PATCH 4/9] linux: 5.15.99 -> 5.15.100 (cherry picked from commit b8f7014cd37c114eabf0fe1f47c500dc4102578a) --- pkgs/os-specific/linux/kernel/linux-5.15.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.15.nix b/pkgs/os-specific/linux/kernel/linux-5.15.nix index fb46a2ef9c2a..254463a5b89d 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.99"; + version = "5.15.100"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "0ih3pqxv8kwc8awkd7f5cib9zdnmz6hczqfcz62s7bppjchbicwr"; + sha256 = "09qlihw3pmb52kdsrm9pd6vbvfkrxrvpyzw896dqgbf11y3wx97p"; }; } // (args.argsOverride or { })) From 872217a5fbff652b1a0ec170642820af36f78158 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sat, 11 Mar 2023 21:08:12 +0100 Subject: [PATCH 5/9] linux: 5.4.234 -> 5.4.235 (cherry picked from commit 268d3c83e9bb8606cba66d81d7ae6634733438a4) --- pkgs/os-specific/linux/kernel/linux-5.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.4.nix b/pkgs/os-specific/linux/kernel/linux-5.4.nix index 88091c519d4a..060c3069fdae 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.4.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.4.234"; + version = "5.4.235"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "1489jnp4vb8p879hq1nx3xgyzjdwj1zalk3x4vcbnc9f7yrrrixc"; + sha256 = "1yqlvfw15mvmn6fh7gpck799pw4a2sip52ar9ammi0qdp96x1gxq"; }; } // (args.argsOverride or {})) From fd4fb86e9587fbc484f6f98cc062832ed4494179 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sat, 11 Mar 2023 21:08:25 +0100 Subject: [PATCH 6/9] linux: 6.1.16 -> 6.1.18 (cherry picked from commit 543d1cb0ab572de71d9b6fbb7ab61da8c4089f78) --- pkgs/os-specific/linux/kernel/linux-6.1.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-6.1.nix b/pkgs/os-specific/linux/kernel/linux-6.1.nix index 5dd13c37f057..830d892bfff3 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.16"; + version = "6.1.18"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v6.x/linux-${version}.tar.xz"; - sha256 = "1id3dn0p724yp3n4wqk6bhs21yjhqihiilkagfh1am8bb1arr156"; + sha256 = "07hlmv00wqi7497c3y6w7494qsxgd97kzy7xa30v0vqfzxgc2al4"; }; } // (args.argsOverride or { })) From 8639591c6c4b01bc93fadaa9f2902f1be7ad7e1c Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sat, 11 Mar 2023 21:08:37 +0100 Subject: [PATCH 7/9] linux: 6.2.3 -> 6.2.5 (cherry picked from commit a693dc5ccf4274faedf94d959c9271ab08c8d869) --- pkgs/os-specific/linux/kernel/linux-6.2.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-6.2.nix b/pkgs/os-specific/linux/kernel/linux-6.2.nix index 1fbdb1ff9e58..e2e9e74a0a67 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.3"; + version = "6.2.5"; # 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 = "091r0rjj5ba50kiq96099w79ayzcdy6qyzgkmw10hxqkzia0nvdk"; + sha256 = "1fg5rq40fi7xkx3pw54538gydygbizg492aqfnh0hn3fry903av5"; }; } // (args.argsOverride or { })) From 58609b1b294d0c28cb6d5f62c35b055592cebc38 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sat, 11 Mar 2023 21:09:00 +0100 Subject: [PATCH 8/9] linux_latest-libre: 19049 -> 19102 (cherry picked from commit d13fc847f130bb8dcdbad7dafb8f5350ea34736d) --- pkgs/os-specific/linux/kernel/linux-libre.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-libre.nix b/pkgs/os-specific/linux/kernel/linux-libre.nix index 7e3ffb4720a3..59622c62702b 100644 --- a/pkgs/os-specific/linux/kernel/linux-libre.nix +++ b/pkgs/os-specific/linux/kernel/linux-libre.nix @@ -1,8 +1,8 @@ { stdenv, lib, fetchsvn, linux , scripts ? fetchsvn { url = "https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/branches/"; - rev = "19049"; - sha256 = "0873qyk69p8hr91qjaq5rd9z2i6isd3yq3slh1my5y33gc7d3bj2"; + rev = "19102"; + sha256 = "1w9zl7grws1nzq4zp4mj1v5a6akqwkzy9lf0wwdar68jbxav3fvf"; } , ... }: From 12aebea71c64011c99d2df27e7b7c3d05e62971c Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sat, 11 Mar 2023 21:27:16 +0100 Subject: [PATCH 9/9] linux: fix `brcmfmac` driver Reverts a patch that broke WPA auth in offload mode for brcmfmac (broadcom driver). See https://lore.kernel.org/linux-wireless/ZAx0TWRBlGfv7pNl@kroah.com/T/#m0bbd179b92fbbcae0498fd642c31c1ecab1968c0 for context. Had to hack around a bit to make sure this doesn't get applied to hardened which uses an older patch-level without the problematic patch. (cherry picked from commit 141317dff92656e67ffb726c727766ceffcba52b) --- pkgs/os-specific/linux/kernel/patches.nix | 9 +++++++++ pkgs/top-level/linux-kernels.nix | 11 ++++++++++- 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index 5912abf4181d..68436fbf97a7 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -62,4 +62,13 @@ name = "fix-em-ice-bonding"; patch = ./fix-em-ice-bonding.patch; }; + + # https://lore.kernel.org/linux-wireless/ZAx0TWRBlGfv7pNl@kroah.com/T/#m11e6e0915ab8fa19ce8bc9695ab288c0fe018edf + fix-brcmfmac = { + name = "fix-brcmfmac"; + patch = fetchpatch { + url = "https://lore.kernel.org/linux-wireless/20230311141914.24444-1-marcan@marcan.st/raw"; + sha256 = "sha256-Fjap48Lef8Mi1i0t13/rT2SoYcbO8HJuXhJMn7HK3Ds="; + }; + }; } diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index ab1972218811..e6f876f29092 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -34,6 +34,8 @@ let major = lib.versions.major version; sha256 = kernelPatches.hardened.${kernel.meta.branch}.sha256; modDirVersion' = builtins.replaceStrings [ kernel.version ] [ version ] kernel.modDirVersion; + # FIXME remove as soon as the revert happened upstream! + basePatches = lib.filter ({ name, ... }: name != "fix-brcmfmac") kernel.kernelPatches; in kernel.override { structuredExtraConfig = import ../os-specific/linux/kernel/hardened/config.nix { inherit stdenv lib version; @@ -45,7 +47,7 @@ let inherit sha256; }; }; - kernelPatches = kernel.kernelPatches ++ [ + kernelPatches = basePatches ++ [ kernelPatches.hardened.${kernel.meta.branch} ]; modDirVersionArg = modDirVersion' + (kernelPatches.hardened.${kernel.meta.branch}).extra; @@ -103,6 +105,7 @@ in { # when adding a new linux version kernelPatches.cpu-cgroup-v2."4.11" kernelPatches.modinst_arg_list_too_long + kernelPatches.fix-brcmfmac ]; }; @@ -111,6 +114,7 @@ in { [ kernelPatches.bridge_stp_helper kernelPatches.request_key_helper kernelPatches.modinst_arg_list_too_long + kernelPatches.fix-brcmfmac ]; }; @@ -119,6 +123,7 @@ in { kernelPatches.bridge_stp_helper kernelPatches.request_key_helper kernelPatches.rtl8761b_support + kernelPatches.fix-brcmfmac ]; }; @@ -133,6 +138,7 @@ in { kernelPatches = [ kernelPatches.bridge_stp_helper kernelPatches.request_key_helper + kernelPatches.fix-brcmfmac ]; }; @@ -149,6 +155,7 @@ in { kernelPatches.bridge_stp_helper kernelPatches.request_key_helper kernelPatches.fix-em-ice-bonding + kernelPatches.fix-brcmfmac ]; }; @@ -163,6 +170,7 @@ in { kernelPatches.bridge_stp_helper kernelPatches.request_key_helper kernelPatches.fix-em-ice-bonding + kernelPatches.fix-brcmfmac ]; }; @@ -171,6 +179,7 @@ in { kernelPatches.bridge_stp_helper kernelPatches.request_key_helper kernelPatches.fix-em-ice-bonding + kernelPatches.fix-brcmfmac ]; };