Skip to content

Commit 652b22a

Browse files
Ma27Ma27
authored
Merge: Linux Hardened Kernel Updates for 2024-11-06 (#354110)
2 parents 456a0da + fddcebd commit 652b22a

File tree

5 files changed

+40
-25
lines changed

5 files changed

+40
-25
lines changed

‎ci/OWNERS‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -232,11 +232,11 @@ pkgs/development/python-modules/buildcatrust/ @ajs124 @lukegb @mweinelt
232232
/nixos/tests/postgresql.nix @NixOS/postgres
233233

234234
# Hardened profile & related modules
235-
/nixos/modules/profiles/hardened.nix @joachifm
236-
/nixos/modules/security/lock-kernel-modules.nix @joachifm
237-
/nixos/modules/security/misc.nix @joachifm
238-
/nixos/tests/hardened.nix @joachifm
239-
/pkgs/os-specific/linux/kernel/hardened/config.nix @joachifm
235+
/nixos/modules/profiles/hardened.nix @joachifm
236+
/nixos/modules/security/lock-kernel-modules.nix @joachifm
237+
/nixos/modules/security/misc.nix @joachifm
238+
/nixos/tests/hardened.nix @joachifm
239+
/pkgs/os-specific/linux/kernel/hardened/ @fabianhjr @joachifm
240240

241241
# Home Automation
242242
/nixos/modules/services/home-automation/home-assistant.nix @mweinelt

‎nixos/tests/kernel-generic.nix‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ let
3030
linux_5_15_hardened
3131
linux_6_1_hardened
3232
linux_6_6_hardened
33+
linux_6_11_hardened
3334
linux_rt_5_4
3435
linux_rt_5_10
3536
linux_rt_5_15

‎pkgs/os-specific/linux/kernel/hardened/patches.json‎

Lines changed: 30 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -2,22 +2,22 @@
22
"5.10": {
33
"patch": {
44
"extra": "-hardened1",
5-
"name": "linux-hardened-v5.10.226-hardened1.patch",
6-
"sha256": "1vxcr0f3ikkg10wcvq76djxzmhlc6h5fv34xf8vm48wfi7ryajbk",
7-
"url": "https://github.com/anthraxx/linux-hardened/releases/download/v5.10.226-hardened1/linux-hardened-v5.10.226-hardened1.patch"
5+
"name": "linux-hardened-v5.10.228-hardened1.patch",
6+
"sha256": "1fzpiv9gn2krbx2v61j1dzzsdm0qlgps4rjdkzmi8a8fv9g1iq0p",
7+
"url": "https://github.com/anthraxx/linux-hardened/releases/download/v5.10.228-hardened1/linux-hardened-v5.10.228-hardened1.patch"
88
},
9-
"sha256": "19hwwl5sbya65mch7fwmji2cli9b8796zjqbmkybjrarg1j9m8gn",
10-
"version": "5.10.226"
9+
"sha256": "0wkvn49sdy9ykyz6cqdqd9yplqfhc6b255w6wc17ky182mzqvk3n",
10+
"version": "5.10.228"
1111
},
1212
"5.15": {
1313
"patch": {
1414
"extra": "-hardened1",
15-
"name": "linux-hardened-v5.15.167-hardened1.patch",
16-
"sha256": "1mwww490bf5i1njzyprnamfn8n471r94klgn7wghwi2f5vsn6j9g",
17-
"url": "https://github.com/anthraxx/linux-hardened/releases/download/v5.15.167-hardened1/linux-hardened-v5.15.167-hardened1.patch"
15+
"name": "linux-hardened-v5.15.170-hardened1.patch",
16+
"sha256": "16b3dzfgx737hsr16n9j3v4lr1qrl5vgsjmmcri0szbcd5sm0620",
17+
"url": "https://github.com/anthraxx/linux-hardened/releases/download/v5.15.170-hardened1/linux-hardened-v5.15.170-hardened1.patch"
1818
},
19-
"sha256": "0c6s6l5sz9ibws7bymb393ww0z9i3amsk1yx0bahipz3xhc1yxdi",
20-
"version": "5.15.167"
19+
"sha256": "1ag7fvixhdcyxv6rqfsvq2wh02g64r4rx8izvfb33nfnld2nangx",
20+
"version": "5.15.170"
2121
},
2222
"5.4": {
2323
"patch": {
@@ -32,21 +32,31 @@
3232
"6.1": {
3333
"patch": {
3434
"extra": "-hardened1",
35-
"name": "linux-hardened-v6.1.112-hardened1.patch",
36-
"sha256": "1kna12dhs1csg2cd9ixm261pgnc44v7q67njd0z1mnjrk9q1y7n6",
37-
"url": "https://github.com/anthraxx/linux-hardened/releases/download/v6.1.112-hardened1/linux-hardened-v6.1.112-hardened1.patch"
35+
"name": "linux-hardened-v6.1.115-hardened1.patch",
36+
"sha256": "1vly83nqpridysywj8aby6pmzjgz7jlk6ni957s9v05gfkvf906l",
37+
"url": "https://github.com/anthraxx/linux-hardened/releases/download/v6.1.115-hardened1/linux-hardened-v6.1.115-hardened1.patch"
3838
},
39-
"sha256": "094z3wfcxqx2rbi072i5frshpy6rdvk39aahwm9nc07vc8sxxn4b",
40-
"version": "6.1.112"
39+
"sha256": "0vxs6zj4p0ihcp11h3svqy3wa1yph0f1vzc8dlvqh60zgs1bmn0g",
40+
"version": "6.1.115"
41+
},
42+
"6.11": {
43+
"patch": {
44+
"extra": "-hardened1",
45+
"name": "linux-hardened-v6.11.6-hardened1.patch",
46+
"sha256": "0g5drxsknvhcd80s1mwmbbc9d3v3qpj4c7rha95ygzwxidvagr9f",
47+
"url": "https://github.com/anthraxx/linux-hardened/releases/download/v6.11.6-hardened1/linux-hardened-v6.11.6-hardened1.patch"
48+
},
49+
"sha256": "1kiky6viwrgm47slpv234lfq1wrwj29p5rx168gix3q0jw0zcm69",
50+
"version": "6.11.6"
4151
},
4252
"6.6": {
4353
"patch": {
4454
"extra": "-hardened1",
45-
"name": "linux-hardened-v6.6.53-hardened1.patch",
46-
"sha256": "09i25qrn18psyrzr8srav4zcbyqmn2z8ycfk9fix2pdfxsaxl8h9",
47-
"url": "https://github.com/anthraxx/linux-hardened/releases/download/v6.6.53-hardened1/linux-hardened-v6.6.53-hardened1.patch"
55+
"name": "linux-hardened-v6.6.59-hardened1.patch",
56+
"sha256": "1vdyryd0m9rr0z2pznq6jyxbdhy4w4x85c37gfl4sbbcs9549gnw",
57+
"url": "https://github.com/anthraxx/linux-hardened/releases/download/v6.6.59-hardened1/linux-hardened-v6.6.59-hardened1.patch"
4858
},
49-
"sha256": "0yfpyiz57wz9rkwif6n3k2n87waw46ad0h7h0pwhnar53cfihp98",
50-
"version": "6.6.53"
59+
"sha256": "0vd76ccd4li4wsg04gc4nai9f4y1nknz967qby0i53y0v046hq93",
60+
"version": "6.6.59"
5161
}
5262
}

‎pkgs/top-level/all-packages.nix‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25637,6 +25637,8 @@ with pkgs;
2563725637
linux_6_1_hardened = linuxKernel.kernels.linux_6_1_hardened;
2563825638
linuxPackages_6_6_hardened = linuxKernel.packages.linux_6_6_hardened;
2563925639
linux_6_6_hardened = linuxKernel.kernels.linux_6_6_hardened;
25640+
linuxPackages_6_11_hardened = linuxKernel.packages.linux_6_11_hardened;
25641+
linux_6_11_hardened = linuxKernel.kernels.linux_6_11_hardened;
2564025642

2564125643
# GNU Linux-libre kernels
2564225644
linuxPackages-libre = linuxKernel.packages.linux_libre;

‎pkgs/top-level/linux-kernels.nix‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -263,6 +263,7 @@ in {
263263
linux_5_15_hardened = hardenedKernelFor kernels.linux_5_15 { };
264264
linux_6_1_hardened = hardenedKernelFor kernels.linux_6_1 { };
265265
linux_6_6_hardened = hardenedKernelFor kernels.linux_6_6 { };
266+
linux_6_11_hardened = hardenedKernelFor kernels.linux_6_11 { };
266267

267268
} // lib.optionalAttrs config.allowAliases {
268269
linux_4_14 = throw "linux 4.14 was removed because it will reach its end of life within 23.11";
@@ -658,6 +659,7 @@ in {
658659
linux_5_15_hardened = recurseIntoAttrs (packagesFor kernels.linux_5_15_hardened);
659660
linux_6_1_hardened = recurseIntoAttrs (packagesFor kernels.linux_6_1_hardened);
660661
linux_6_6_hardened = recurseIntoAttrs (packagesFor kernels.linux_6_6_hardened);
662+
linux_6_11_hardened = recurseIntoAttrs (packagesFor kernels.linux_6_11_hardened);
661663

662664
linux_zen = recurseIntoAttrs (packagesFor kernels.linux_zen);
663665
linux_lqx = recurseIntoAttrs (packagesFor kernels.linux_lqx);

0 commit comments

Comments
 (0)