cc-wrapper: ensure NIX_HARDENING_ENABLE fortify3 implies fortify too#253194
Merged
risicle merged 1 commit intoNixOS:stagingfrom Oct 23, 2023
Merged
Conversation
12 tasks
ofborg
bot
added
10.rebuild-darwin-stdenv
even if fortify3 is in hardening_unsupported_flags
risicle
force-pushed
the
ris-nix-hardening-enable-fortify3-imply-fortify
branch
from
b5f6139 to
4c6fd59
Compare
|
This pull request has been mentioned on NixOS Discourse. There might be relevant details there: https://discourse.nixos.org/t/prs-ready-for-review/3032/2705 |
ghost
approved these changes
Oct 23, 2023
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description of changes
i.e. even if
fortify3is inhardening_unsupported_flagsThis fixes a rather obscure piece of behaviour that probably wouldn't have been noticed by anything other than my hardening flag test suite (see #253186).
But it makes the clang and gcc paths behave ever so slightly differently due to clang being marked with
hardeningUnsupportedFlags = [ "fortify3" ];. It currently has the effect of also disablingfortifyif onlyfortify3is mentioned inNIX_HARDENING_ENABLEfor some reason, and I think most people would find that behaviour surprising.Things done
sandbox = trueset innix.conf? (See Nix manual)nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)