From: Jo-Philipp Wich <jo@mein.io>
Date: Thu, 25 Jan 2018 16:12:29 +0000 (+0100)
Subject: build: bundle-libraries.sh: patch bundled ld.so
X-Git-Tag: v18.06.0-rc1~1101
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=a9a43f3d791da40893832616e79bbeed198a1ddb;p=oweals%2Fopenwrt.git

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 <jo@mein.io>
---

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