[gentoo-commits] gentoo-x86 commit in sys-libs/glibc/files/eblits: pkg_preinst.eblit

[Diego Petteno (flameeyes)]

flameeyes    10/10/08 15:33:13

  Modified:             pkg_preinst.eblit
  Log:
  QA: avoid using $D when testing the just-built loader, as it might cause trouble when it contains colon characters; the fix is trivial.
  
  (Portage version: 2.2_rc91/cvs/Linux x86_64)

Revision  Changes    Path
1.3                  sys-libs/glibc/files/eblits/pkg_preinst.eblit

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/files/eblits/pkg_preinst.eblit?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/files/eblits/pkg_preinst.eblit?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/files/eblits/pkg_preinst.eblit?r1=1.2&r2=1.3

Index: pkg_preinst.eblit
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/pkg_preinst.eblit,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- pkg_preinst.eblit	19 Dec 2009 23:44:54 -0000	1.2
+++ pkg_preinst.eblit	8 Oct 2010 15:33:13 -0000	1.3
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/pkg_preinst.eblit,v 1.2 2009/12/19 23:44:54 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/pkg_preinst.eblit,v 1.3 2010/10/08 15:33:13 flameeyes Exp $
 
 fix_lib64_symlinks() {
 	# the original Gentoo/AMD64 devs decided that since 64bit is the native
@@ -75,9 +75,16 @@
 		striptest=$(LC_ALL="C" file -L ${x} 2>/dev/null)
 		[[ -z ${striptest} ]] && continue
 		[[ ${striptest} == *"statically linked"* ]] && continue
-		"${D}"/$(get_libdir)/ld-*.so \
-			--library-path "${D}"/$(get_libdir) \
-			${x} > /dev/null \
+		# we enter ${D} so to avoid trouble if the path contains
+		# special characters; for instance if the path contains the
+		# colon character (:), then the linker will try to split it
+		# and look for the libraries in an unexpected place. This can
+		# lead to unsafe code execution if the generated prefix is
+		# within a world-writable directory
+		# (e.g. /var/tmp/portage:${HOSTNAME})
+		pushd "${D}"/$(get_libdir) 2>/dev/null
+		./ld-*.so --library-path . ${x} > /dev/null \
 			|| die "simple run test (${x}) failed"
+		popd 2>/dev/null
 	done
 }