diff --git a/usr/bin/permission-hardener b/usr/bin/permission-hardener index 6dab5c6..43d3789 100755 --- a/usr/bin/permission-hardener +++ b/usr/bin/permission-hardener @@ -16,6 +16,7 @@ dpkg_admindir_parameter_existing_mode="--admindir ${store_dir}/existing_mode" dpkg_admindir_parameter_new_mode="--admindir ${store_dir}/new_mode" delimiter="#permission-hardener-delimiter#" +source /usr/libexec/helper-scripts/safe_echo.sh # shellcheck disable=SC2034 log_level=notice # shellcheck disable=SC1091 @@ -174,7 +175,7 @@ add_nosuid_statoverride_entry() { while IFS="" read -r -d "" dummy_line; do log info "Test would parse line: '${dummy_line}'" should_be_counter=$((should_be_counter + 1)) - done < <(printf -- "${fso_to_process}" | find -files0-from - -perm /u=s,g=s -print0) + done < <(safe_echo_nonewline "${fso_to_process}" | find -files0-from - -perm /u=s,g=s -print0) local line while IFS="" read -r -d "" file_name; do @@ -328,7 +329,7 @@ add_nosuid_statoverride_entry() { ## /usr/lib will hit ARG_MAX if using bash 'shopt -s globstar' and '/usr/lib/**'. ## Using 'find' with '-perm /u=s,g=s' is faster and avoids ARG_MAX. ## https://forums.whonix.org/t/disable-suid-binaries/7706/17 - done < <(printf -- "${fso_to_process}" | find -files0-from - -perm /u=s,g=s -print0) + done < <(safe_echo_nonewline "${fso_to_process}" | find -files0-from - -perm /u=s,g=s -print0) ## Sanity test. if test ! "${should_be_counter}" = "${counter_actual}"; then