From 54c0ef6ff5217cab1deef4ef816ddd63ec837ad3 Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Thu, 25 Jan 2018 17:12:29 +0100 Subject: [PATCH] build: bundle-libraries.sh: patch bundled ld.so Remove references to /etc/, /lib/ and /usr/ from the bundled ld.so interpreter using simple binary patching. This is needed to prevent loading host system libraries such as libnss_compat.so.2 on foreign systems, which may result in ld.so inconsistency assertions. Signed-off-by: Jo-Philipp Wich (cherry picked from commit a9a43f3d791da40893832616e79bbeed198a1ddb) --- scripts/bundle-libraries.sh | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/scripts/bundle-libraries.sh b/scripts/bundle-libraries.sh index f254d4da47..bfe681ad60 100755 --- a/scripts/bundle-libraries.sh +++ b/scripts/bundle-libraries.sh @@ -97,6 +97,18 @@ _runas_so() { } } +_patch_ldso() { + _cp "$1" "$1.patched" + sed -i -e 's,/\(usr\|lib\|etc\)/,/###/,g' "$1.patched" + + if "$1.patched" 2>&1 | grep -q -- --library-path; then + _mv "$1.patched" "$1" + else + echo "binary patched ${1##*/} not executable, using original" >&2 + rm -f "$1.patched" + fi +} + for LDD in ${PATH//://ldd }/ldd; do "$LDD" --version >/dev/null 2>/dev/null && break LDD="" @@ -135,6 +147,7 @@ for BIN in "$@"; do [ -f "$token" -a ! -f "$dest" ] && { _md "$ddir" _cp "$token" "$dest" + [ -n "$LDSO" ] && _patch_ldso "$dest" } ;; esac done -- 2.30.2