diff options
| author | Zac Medico <zmedico@gentoo.org> | 2011-12-21 21:43:51 -0800 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2011-12-21 21:43:51 -0800 |
| commit | c3a50a9a2c8116c95c8b2f89d570a89c299ddea3 (patch) | |
| tree | a0f32afe5ee26e39811d71db302cd293c90e959b | |
| parent | 9164879113f6ac42bdec498739fbae2ce6af9ae3 (diff) | |
| download | portage-c3a50a9a2c8116c95c8b2f89d570a89c299ddea3.tar.gz portage-c3a50a9a2c8116c95c8b2f89d570a89c299ddea3.tar.bz2 portage-c3a50a9a2c8116c95c8b2f89d570a89c299ddea3.zip | |
filter_readonly_variables: don't trust binpkg var
| -rw-r--r-- | bin/phase-functions.sh | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/bin/phase-functions.sh b/bin/phase-functions.sh index 482fd6ac2..7407aba93 100644 --- a/bin/phase-functions.sh +++ b/bin/phase-functions.sh @@ -92,6 +92,8 @@ filter_readonly_variables() { local filtered_sandbox_vars="SANDBOX_ACTIVE SANDBOX_BASHRC SANDBOX_DEBUG_LOG SANDBOX_DISABLED SANDBOX_LIB SANDBOX_LOG SANDBOX_ON" + # Untrusted due to possible application of package renames to binpkgs + local binpkg_untrusted_vars="CATEGORY P PF PN PR PV PVR" local misc_garbage_vars="_portage_filter_opts" filtered_vars="$readonly_bash_vars $bash_misc_vars $PORTAGE_READONLY_VARS $misc_garbage_vars" @@ -130,6 +132,8 @@ filter_readonly_variables() { ${PORTAGE_SAVED_READONLY_VARS} ${PORTAGE_MUTABLE_FILTERED_VARS} " + elif ! has --allow-extra-vars $* ; then + filtered_vars+=" ${binpkg_untrusted_vars}" fi "${PORTAGE_PYTHON:-/usr/bin/python}" "${PORTAGE_BIN_PATH}"/filter-bash-environment.py "${filtered_vars}" || die "filter-bash-environment.py failed" |