From: Ryan S. Arnold <rsa@linux.vnet.ibm.com>
Date: Thu, 1 Aug 2013 16:11:18 +0000 (-0300)
Subject: Remove assert() if DT_RUNPATH and DT_RPATH flags are found in ld.so.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2d16bebbeabd3ab312998c969e21d092ff348485;p=thirdparty%2Fglibc.git

Remove assert() if DT_RUNPATH and DT_RPATH flags are found in ld.so.
---

diff --git a/ChangeLog b/ChangeLog
index 6aecb1b26ec..cbb6a56eb45 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2012-07-06  Ryan S. Arnold  <rsa@linux.vnet.ibm.com>
+
+	* elf/get-dynamic-info.h (elf_get_dynamic_info): Remove assert()
+	around DT_RUNPATH and DT_RPATH which prevents running a dynamic
+	linker with an embedded RPATH flag, which is what a compiler
+	modified to embed a non-default INTERP section would do.
+
+
 2013-07-30  David S. Miller  <davem@davemloft.net>
 
 	* po/fr.po: Update French translation from translation project.
diff --git a/elf/get-dynamic-info.h b/elf/get-dynamic-info.h
index 3cc10733e56..57cf964f20b 100644
--- a/elf/get-dynamic-info.h
+++ b/elf/get-dynamic-info.h
@@ -130,8 +130,8 @@ elf_get_dynamic_info (struct link_map *l, ElfW(Dyn) *temp)
   assert (info[DT_FLAGS] == NULL
 	  || (info[DT_FLAGS]->d_un.d_val & ~DF_BIND_NOW) == 0);
   /* Flags must not be set for ld.so.  */
-  assert (info[DT_RUNPATH] == NULL);
-  assert (info[DT_RPATH] == NULL);
+  info[DT_RUNPATH] = NULL;
+  info[DT_RPATH] = NULL;
 #else
   if (info[DT_FLAGS] != NULL)
     {