-
-
Notifications
You must be signed in to change notification settings - Fork 14.7k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'origin/pr/13505'
- Loading branch information
Showing
10 changed files
with
218 additions
and
95 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,26 +1,17 @@ | ||
| let | ||
| mkOpts = ver: prio: sys: virt: swvirt: hwvirt: | ||
| mkOpts = prio: sys: virt: swvirt: hwvirt: | ||
| { config.priority = prio; | ||
| config.system = sys; | ||
| config.virtualisationConfig = virt; | ||
| config.hardwareVirtualisation = hwvirt; | ||
| config.virtualisationSoftware = swvirt; | ||
| } // builtins.listToAttrs [ { name = ver; value = true; } ]; | ||
| }; | ||
| in | ||
| { | ||
| # Stable kernels | ||
| linux_grsec_stable_desktop = | ||
| mkOpts "stable" "performance" "desktop" "host" "kvm" true; | ||
| linux_grsec_stable_server = | ||
| mkOpts "stable" "security" "server" "host" "kvm" true; | ||
| linux_grsec_stable_server_xen = | ||
| mkOpts "stable" "security" "server" "guest" "xen" true; | ||
|
|
||
| # Testing kernels | ||
| linux_grsec_testing_desktop = | ||
| mkOpts "testing" "performance" "desktop" "host" "kvm" true; | ||
| linux_grsec_testing_server = | ||
| mkOpts "testing" "security" "server" "host" "kvm" true; | ||
| linux_grsec_testing_server_xen = | ||
| mkOpts "testing" "security" "server" "guest" "xen" true; | ||
| desktop = | ||
| mkOpts "performance" "desktop" "host" "kvm" true; | ||
| server = | ||
| mkOpts "security" "server" "host" "kvm" true; | ||
| server_xen = | ||
| mkOpts "security" "server" "guest" "xen" true; | ||
| } |
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| diff --git a/kernel/kmod.c b/kernel/kmod.c | ||
| index a689506..30747b4 100644 | ||
| --- a/kernel/kmod.c | ||
| +++ b/kernel/kmod.c | ||
| @@ -294,11 +294,8 @@ static int ____call_usermodehelper(void *data) | ||
| out the path to be used prior to this point and are now operating | ||
| on that copy | ||
| */ | ||
| - if ((strncmp(sub_info->path, "/sbin/", 6) && strncmp(sub_info->path, "/usr/lib/", 9) && | ||
| - strncmp(sub_info->path, "/lib/", 5) && strncmp(sub_info->path, "/lib64/", 7) && | ||
| - strncmp(sub_info->path, "/usr/libexec/", 13) && strncmp(sub_info->path, "/usr/bin/", 9) && | ||
| - strncmp(sub_info->path, "/usr/sbin/", 10) && | ||
| - strcmp(sub_info->path, "/usr/share/apport/apport")) || strstr(sub_info->path, "..")) { | ||
| + if ((strncmp(sub_info->path, "/sbin/", 6) && strncmp(sub_info->path, "/nix/store/", 11) && | ||
| + strncmp(sub_info->path, "/run/current-system/systemd/lib/", 32)) || strstr(sub_info->path, "..")) { | ||
| printk(KERN_ALERT "grsec: denied exec of usermode helper binary %.950s located outside of permitted system paths\n", sub_info->path); | ||
| retval = -EPERM; | ||
| goto out; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| { stdenv, fetchurl, perl, buildLinux, ... } @ args: | ||
|
|
||
| import ./generic.nix (args // rec { | ||
| version = "3.14.51"; | ||
| extraMeta.branch = "3.14"; | ||
|
|
||
| src = fetchurl { | ||
| url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; | ||
| sha256 = "1gqsd69cqijff4c4br4ydmcjl226d0yy6vrmgfvy16xiraavq1mk"; | ||
| }; | ||
|
|
||
| kernelPatches = args.kernelPatches; | ||
|
|
||
| features.iwlwifi = true; | ||
| features.efiBootStub = true; | ||
| features.needsCifsUtils = true; | ||
| features.canDisableNetfilterConntrackHelpers = true; | ||
| features.netfilterRPFilter = true; | ||
| } // (args.argsOverride or {})) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| { stdenv, fetchurl, perl, buildLinux, ... } @ args: | ||
|
|
||
| import ./generic.nix (args // rec { | ||
| version = "4.1.7"; | ||
| extraMeta.branch = "4.1"; | ||
|
|
||
| src = fetchurl { | ||
| url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; | ||
| sha256 = "0g1dnvak0pd03d4miy1025bw64wq71w29a058dzspdr6jcf9qwbn"; | ||
| }; | ||
|
|
||
| kernelPatches = args.kernelPatches; | ||
|
|
||
| features.iwlwifi = true; | ||
| features.efiBootStub = true; | ||
| features.needsCifsUtils = true; | ||
| features.canDisableNetfilterConntrackHelpers = true; | ||
| features.netfilterRPFilter = true; | ||
| } // (args.argsOverride or {})) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| { stdenv, fetchurl, perl, buildLinux, ... } @ args: | ||
|
|
||
| import ./generic.nix (args // rec { | ||
| version = "4.4.2"; | ||
| extraMeta.branch = "4.4"; | ||
|
|
||
| src = fetchurl { | ||
| url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; | ||
| sha256 = "09l6y0nb8yv7l16arfwhy4i5h9pkxcbd7hlbw0015n7gm4i2mzc2"; | ||
| }; | ||
|
|
||
| kernelPatches = args.kernelPatches; | ||
|
|
||
| features.iwlwifi = true; | ||
| features.efiBootStub = true; | ||
| features.needsCifsUtils = true; | ||
| features.canDisableNetfilterConntrackHelpers = true; | ||
| features.netfilterRPFilter = true; | ||
| } // (args.argsOverride or {})) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.