Unverified Commit 597c7a90 authored by Emily's avatar Emily Committed by GitHub
Browse files

various: fix Scudo allocator due to LLVM update (#444605)

parents 855a52f0 753af06d

nixos/modules/config/malloc.nix

+1 −1
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ let 
            or (throw "scudo not supported on ${pkgs.stdenv.hostPlatform.system}");

      in

      {

        libPath = "${pkgs.llvmPackages.compiler-rt}/lib/linux/libclang_rt.scudo-${systemPlatform}.so";

        libPath = "${pkgs.llvmPackages.compiler-rt}/lib/linux/libclang_rt.scudo_standalone-${systemPlatform}.so";

        description = ''

          A user-mode allocator based on LLVM Sanitizer’s CombinedAllocator,

          which aims at providing additional mitigations against heap based

nixos/modules/profiles/hardened.nix

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ in 
    nix.settings.allowed-users = mkDefault [ "@users" ];



    environment.memoryAllocator.provider = mkDefault "scudo";

    environment.variables.SCUDO_OPTIONS = mkDefault "ZeroContents=1";

    environment.variables.SCUDO_OPTIONS = mkDefault "zero_contents=true";



    security.lockKernelModules = mkDefault true;

pkgs/development/compilers/llvm/common/compiler-rt/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -102,7 +102,7 @@ stdenv.mkDerivation (finalAttrs: { 
  env = {

    NIX_CFLAGS_COMPILE = toString (

      [

        "-DSCUDO_DEFAULT_OPTIONS=DeleteSizeMismatch=0:DeallocationTypeMismatch=0"

        "-DSCUDO_DEFAULT_OPTIONS=delete_size_mismatch=false:dealloc_type_mismatch=false"

      ]

      ++ lib.optionals (!haveLibc) [

        # The compiler got stricter about this, and there is a usellvm patch below