diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2020-03-14 14:34:59 +0100 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-03-14 14:34:59 +0100 |
| commit | 0c13b0d7d323478634220c99c7a80628039ba96a (patch) | |
| tree | 8bf7fd434aadabcc05a51178824546d176ef0575 /pkgs/os-specific/linux | |
| parent | 699eb403539cea4cc3a60d61351839d421cba2bd (diff) | |
| parent | 9fd82b3e7e99678dab327332bcffec4aad01d22b (diff) | |
| download | nixlib-0c13b0d7d323478634220c99c7a80628039ba96a.tar nixlib-0c13b0d7d323478634220c99c7a80628039ba96a.tar.gz nixlib-0c13b0d7d323478634220c99c7a80628039ba96a.tar.bz2 nixlib-0c13b0d7d323478634220c99c7a80628039ba96a.tar.lz nixlib-0c13b0d7d323478634220c99c7a80628039ba96a.tar.xz nixlib-0c13b0d7d323478634220c99c7a80628039ba96a.tar.zst nixlib-0c13b0d7d323478634220c99c7a80628039ba96a.zip | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/os-specific/linux')
| -rw-r--r-- | pkgs/os-specific/linux/kernel/hardened-config.nix | 3 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/kernel/linux-5.4.nix | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/pkgs/os-specific/linux/kernel/hardened-config.nix b/pkgs/os-specific/linux/kernel/hardened-config.nix index b28ce770f7a9..3010d87a178a 100644 --- a/pkgs/os-specific/linux/kernel/hardened-config.nix +++ b/pkgs/os-specific/linux/kernel/hardened-config.nix @@ -19,8 +19,7 @@ assert (versionAtLeast version "4.9"); optionalAttrs (stdenv.hostPlatform.platform.kernelArch == "x86_64") { DEFAULT_MMAP_MIN_ADDR = freeform "65536"; # Prevent allocation of first 64K of memory - # Reduce attack surface by disabling various emulations - IA32_EMULATION = no; + # Reduce attack surface by disabling X32 X86_X32 = no; # Note: this config depends on EXPERT y and so will not take effect, hence # it is left "optional" for now. diff --git a/pkgs/os-specific/linux/kernel/linux-5.4.nix b/pkgs/os-specific/linux/kernel/linux-5.4.nix index 2dedc1592e88..5773b171f744 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 stdenv.lib; buildLinux (args // rec { - version = "5.4.24"; + version = "5.4.25"; # 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 = "1cvy3mxwzll4f9j8i3hfmi0i0zq75aiafq1jskp9n4kq9iwar83z"; + sha256 = "09ay0adc3s3m7qk0nj5lkmrp5i0q76a9kax0xix8914d115rgvf0"; }; } // (args.argsOverride or {})) |