colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #239331 from pwaller/fix-pie-hardening

Browse Source
This commit is contained in:
Artturi 2023-07-06 02:14:35 +03:00 committed by GitHub
commit 8bf1b878cf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/build-support/bintools-wrapper/add-hardening.sh
View File

@ -37,11 +37,11 @@ fi
for flag in "${!hardeningEnableMap[@]}"; do for flag in "${!hardeningEnableMap[@]}"; do
case $flag in case $flag in
pie) pie)
if [[ ! (" $* " =~ " -shared " \ if [[ ! (" ${params[*]} " =~ " -shared " \
|| " $* " =~ " -static " \ || " ${params[*]} " =~ " -static " \
|| " $* " =~ " -r " \ || " ${params[*]} " =~ " -r " \
|| " $* " =~ " -Ur " \ || " ${params[*]} " =~ " -Ur " \
|| " $* " =~ " -i ") ]]; then || " ${params[*]} " =~ " -i ") ]]; then
if (( "${NIX_DEBUG:-0}" >= 1 )); then echo HARDENING: enabling LDFlags -pie >&2; fi if (( "${NIX_DEBUG:-0}" >= 1 )); then echo HARDENING: enabling LDFlags -pie >&2; fi
hardeningLDFlags+=('-pie') hardeningLDFlags+=('-pie')
fi fi

2
pkgs/build-support/cc-wrapper/add-hardening.sh
View File

@ -71,7 +71,7 @@ for flag in "${!hardeningEnableMap[@]}"; do
# NB: we do not use `+=` here, because PIE flags must occur before any PIC flags # NB: we do not use `+=` here, because PIE flags must occur before any PIC flags
if (( "${NIX_DEBUG:-0}" >= 1 )); then echo HARDENING: enabling CFlags -fPIE >&2; fi if (( "${NIX_DEBUG:-0}" >= 1 )); then echo HARDENING: enabling CFlags -fPIE >&2; fi
hardeningCFlags=('-fPIE' "${hardeningCFlags[@]}") hardeningCFlags=('-fPIE' "${hardeningCFlags[@]}")
if [[ ! (" $* " =~ " -shared " || " $* " =~ " -static ") ]]; then if [[ ! (" ${params[*]} " =~ " -shared " || " ${params[*]} " =~ " -static ") ]]; then
if (( "${NIX_DEBUG:-0}" >= 1 )); then echo HARDENING: enabling LDFlags -pie >&2; fi if (( "${NIX_DEBUG:-0}" >= 1 )); then echo HARDENING: enabling LDFlags -pie >&2; fi
hardeningCFlags=('-pie' "${hardeningCFlags[@]}") hardeningCFlags=('-pie' "${hardeningCFlags[@]}")
fi fi