[Backport release-26.05] nixos/malloc: check legacy scudo options exist before use (#533463)

This commit is contained in:
Sandro 2026-06-30 22:12:36 +00:00 committed by GitHub
commit de5a80f930
No known key found for this signature in database
GPG key ID: B5690EEEBB952194

View file

@ -142,10 +142,14 @@ in
# so we can warn the user about the change.
legacyOptionsUsed = lib.lists.filter (opt: lib.strings.hasInfix opt scudoOpts) legacyOptionNames;
in
lib.optional (cfg.provider == "scudo" && legacyOptionsUsed != [ ]) ''
environment.variables.SCUDO_OPTIONS: ${lib.concatStringsSep ", " legacyOptionsUsed} is/are no longer valid Scudo options.
Use snake_case instead of CamelCase: https://llvm.org/docs/ScudoHardenedAllocator.html#options
'';
lib.optional
(
config.environment.variables ? SCUDO_OPTIONS && cfg.provider == "scudo" && legacyOptionsUsed != [ ]
)
''
environment.variables.SCUDO_OPTIONS: ${lib.concatStringsSep ", " legacyOptionsUsed} is/are no longer valid Scudo options.
Use snake_case instead of CamelCase: https://llvm.org/docs/ScudoHardenedAllocator.html#options
'';
environment.etc."ld-nix.so.preload".text = ''
${providerLibPath}