glibc-2.14.1-ldso-nodefaultdirs-option.5.diff 8.72 KB
Newer Older
Carsten Munk's avatar
Carsten Munk committed
1 2 3 4
diff -ru eglibc-2.18/elf/dl-load.c eglibc-2.18-nodefaultdirs/elf/dl-load.c
--- eglibc-2.18/elf/dl-load.c	2014-01-01 10:24:04.000000000 +0000
+++ eglibc-2.18-nodefaultdirs/elf/dl-load.c	2014-01-01 10:25:39.000000000 +0000
@@ -2280,7 +2280,9 @@
5 6
 		  /* 'l' is always != NULL for dynamically linked objects.  */
 		  l != NULL &&
Carsten Munk's avatar
Carsten Munk committed
7
 # endif
8
-		  __builtin_expect (l->l_flags_1 & DF_1_NODEFLIB, 0))
Carsten Munk's avatar
Carsten Munk committed
9 10 11
+                  __builtin_expect (((l->l_flags_1 & DF_1_NODEFLIB) ||
+                       GLRO(dl_no_default_dirs)), 0))
+
12 13 14
 		{
 		  const char *dirp = system_dirs;
 		  unsigned int cnt = 0;
Carsten Munk's avatar
Carsten Munk committed
15
@@ -2322,7 +2324,8 @@
16 17 18 19 20 21 22 23 24
       /* Finally, try the default path.  */
       if (fd == -1
 	  && ((l = loader ?: GL(dl_ns)[nsid]._ns_loaded) == NULL
-	      || __builtin_expect (!(l->l_flags_1 & DF_1_NODEFLIB), 1))
+	      || __builtin_expect (!((l->l_flags_1 & DF_1_NODEFLIB) ||
+		GLRO(dl_no_default_dirs)), 1))
 	  && rtld_search_dirs.dirs != (void *) -1)
 	fd = open_path (name, namelen, mode & __RTLD_SECURE, &rtld_search_dirs,
 			&realname, &fb, l, LA_SER_DEFAULT, &found_other_class);
Carsten Munk's avatar
Carsten Munk committed
25
@@ -2488,7 +2491,7 @@
26 27 28 29 30 31 32 33
      a way to indicate that in the results for Dl_serinfo.  */
 
   /* Finally, try the default path.  */
-  if (!(loader->l_flags_1 & DF_1_NODEFLIB))
+  if (!((loader->l_flags_1 & DF_1_NODEFLIB) || GLRO(dl_no_default_dirs)))
     add_path (&rtld_search_dirs, XXX_default);
 
   if (counting)
Carsten Munk's avatar
Carsten Munk committed
34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154
diff -ru eglibc-2.18/elf/dl-load.c.orig eglibc-2.18-nodefaultdirs/elf/dl-load.c.orig
--- eglibc-2.18/elf/dl-load.c.orig	2013-07-02 00:11:45.000000000 +0000
+++ eglibc-2.18-nodefaultdirs/elf/dl-load.c.orig	2014-01-01 10:24:04.000000000 +0000
@@ -481,7 +481,8 @@
 
 static struct r_search_path_elem **
 fillin_rpath (char *rpath, struct r_search_path_elem **result, const char *sep,
-	      int check_trusted, const char *what, const char *where)
+	      int check_trusted, const char *what, const char *where,
+	      const char *rpath_prefix)
 {
   char *cp;
   size_t nelems = 0;
@@ -512,9 +513,23 @@
 	continue;
 
       /* See if this directory is already known.  */
-      for (dirp = GL(dl_all_dirs); dirp != NULL; dirp = dirp->next)
-	if (dirp->dirnamelen == len && memcmp (cp, dirp->dirname, len) == 0)
-	  break;
+      if (__builtin_expect (rpath_prefix != NULL, 0))
+	{
+	  /* has rpath_prefix */
+	  size_t rpath_prefix_len = strlen (rpath_prefix);
+
+	  for (dirp = GL(dl_all_dirs); dirp != NULL; dirp = dirp->next)
+	    if (dirp->dirnamelen == (rpath_prefix_len+len) &&
+		(memcmp (cp, rpath_prefix, rpath_prefix_len) == 0) &&
+		(memcmp (cp+rpath_prefix_len, dirp->dirname, len) == 0))
+	      break;
+	}
+      else
+	{
+	  for (dirp = GL(dl_all_dirs); dirp != NULL; dirp = dirp->next)
+	    if (dirp->dirnamelen == len && memcmp (cp, dirp->dirname, len) == 0)
+	      break;
+	}
 
       if (dirp != NULL)
 	{
@@ -532,22 +547,43 @@
 	  size_t cnt;
 	  enum r_dir_status init_val;
 	  size_t where_len = where ? strlen (where) + 1 : 0;
+	  size_t rpath_prefix_len = 0;
+
+	  if (__builtin_expect (rpath_prefix != NULL, 0)
+	      && !INTUSE(__libc_enable_secure))
+	    {
+		rpath_prefix_len = strlen (rpath_prefix);
+		if (*cp != '/') rpath_prefix_len++; /* need to add a '/' */
+	    }
 
 	  /* It's a new directory.  Create an entry and add it.  */
 	  dirp = (struct r_search_path_elem *)
 	    malloc (sizeof (*dirp) + ncapstr * sizeof (enum r_dir_status)
-		    + where_len + len + 1);
+		    + where_len + rpath_prefix_len + len + 1);
 	  if (dirp == NULL)
 	    _dl_signal_error (ENOMEM, NULL, NULL,
 			      N_("cannot create cache for search path"));
 
 	  dirp->dirname = ((char *) dirp + sizeof (*dirp)
 			   + ncapstr * sizeof (enum r_dir_status));
-	  *((char *) __mempcpy ((char *) dirp->dirname, cp, len)) = '\0';
-	  dirp->dirnamelen = len;
+	  if (rpath_prefix_len == 0)
+	    {
+		  *((char *) __mempcpy ((char *) dirp->dirname, cp, len)) = '\0';
+	    }
+	  else
+	    {
+		char *prefixend;
+
+		prefixend = (char *) __mempcpy ((char *) dirp->dirname,
+				rpath_prefix, rpath_prefix_len);
+		if (*cp != '/')
+		  prefixend[-1] = '/'; /* replace \0 */
+		*((char *) __mempcpy (prefixend, cp, len)) = '\0';
+	    }
+	  dirp->dirnamelen = len + rpath_prefix_len;
 
-	  if (len > max_dirnamelen)
-	    max_dirnamelen = len;
+	  if ((len + rpath_prefix_len) > max_dirnamelen)
+	    max_dirnamelen = len + rpath_prefix_len;
 
 	  /* We have to make sure all the relative directories are
 	     never ignored.  The current directory might change and
@@ -558,7 +594,8 @@
 
 	  dirp->what = what;
 	  if (__builtin_expect (where != NULL, 1))
-	    dirp->where = memcpy ((char *) dirp + sizeof (*dirp) + len + 1
+	    dirp->where = memcpy ((char *) dirp + sizeof (*dirp)
+				  + rpath_prefix_len + len + 1
 				  + (ncapstr * sizeof (enum r_dir_status)),
 				  where, where_len);
 	  else
@@ -660,7 +697,7 @@
       _dl_signal_error (ENOMEM, NULL, NULL, errstring);
     }
 
-  fillin_rpath (copy, result, ":", 0, what, where);
+  fillin_rpath (copy, result, ":", 0, what, where, GLRO(dl_rpath_prefix));
 
   /* Free the copied RPATH string.  `fillin_rpath' make own copies if
      necessary.  */
@@ -865,7 +902,7 @@
 
       (void) fillin_rpath (llp_tmp, env_path_list.dirs, ":;",
 			   INTUSE(__libc_enable_secure), "LD_LIBRARY_PATH",
-			   NULL);
+			   NULL, NULL/*no prefix*/);
 
       if (env_path_list.dirs[0] == NULL)
 	{
diff -ru eglibc-2.18/elf/dl-support.c eglibc-2.18-nodefaultdirs/elf/dl-support.c
--- eglibc-2.18/elf/dl-support.c	2014-01-01 10:24:04.000000000 +0000
+++ eglibc-2.18-nodefaultdirs/elf/dl-support.c	2014-01-01 10:25:39.000000000 +0000
@@ -64,6 +64,9 @@
155 156 157 158 159 160 161 162 163
 /* prefix to be added to all RUNPATHs and RPATHs */
 const char *_dl_rpath_prefix = NULL;
 
+/* flag: don't search default directories if set. */
+int _dl_no_default_dirs = 0;
+
 /* The map for the object we will profile.  */
 struct link_map *_dl_profile_map;
 
Carsten Munk's avatar
Carsten Munk committed
164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180
diff -ru eglibc-2.18/elf/dl-support.c.orig eglibc-2.18-nodefaultdirs/elf/dl-support.c.orig
--- eglibc-2.18/elf/dl-support.c.orig	2013-07-02 00:11:45.000000000 +0000
+++ eglibc-2.18-nodefaultdirs/elf/dl-support.c.orig	2014-01-01 10:24:04.000000000 +0000
@@ -61,6 +61,9 @@
    ignored.  */
 const char *_dl_inhibit_rpath;
 
+/* prefix to be added to all RUNPATHs and RPATHs */
+const char *_dl_rpath_prefix = NULL;
+
 /* The map for the object we will profile.  */
 struct link_map *_dl_profile_map;
 
diff -ru eglibc-2.18/elf/rtld.c eglibc-2.18-nodefaultdirs/elf/rtld.c
--- eglibc-2.18/elf/rtld.c	2014-01-01 10:24:04.000000000 +0000
+++ eglibc-2.18-nodefaultdirs/elf/rtld.c	2014-01-01 10:26:13.000000000 +0000
@@ -978,6 +978,15 @@
181 182 183 184 185 186 187 188 189 190 191 192 193 194 195
 	    --_dl_argc;
 	    ++INTUSE(_dl_argv);
 	  }
+	else if (! strcmp (INTUSE(_dl_argv)[1], "--nodefaultdirs")
+		 && _dl_argc > 2)
+	  {
+	    GLRO(dl_no_default_dirs) = 1;
+
+	    ++_dl_skip_args;
+	    --_dl_argc;
+	    ++INTUSE(_dl_argv);
+	  }
 	else if (! strcmp (INTUSE(_dl_argv)[1], "--library-path")
 		 && _dl_argc > 2)
 	  {
Carsten Munk's avatar
Carsten Munk committed
196 197 198 199
@@ -1051,6 +1060,7 @@
   --inhibit-rpath LIST  ignore RUNPATH and RPATH information in object names\n\
 			in LIST\n\
   --argv0 STRING        use STRING as argv[0]\n\
200
+  --nodefaultdirs       Do not search from default directories or cache\n\
Carsten Munk's avatar
Carsten Munk committed
201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224
   --audit LIST          use objects named in LIST as auditors\n");
 
       ++_dl_skip_args;
diff -ru eglibc-2.18/elf/rtld.c.orig eglibc-2.18-nodefaultdirs/elf/rtld.c.orig
--- eglibc-2.18/elf/rtld.c.orig	2014-01-01 10:23:45.000000000 +0000
+++ eglibc-2.18-nodefaultdirs/elf/rtld.c.orig	2014-01-01 10:24:04.000000000 +0000
@@ -996,6 +996,15 @@
 	    _dl_argc -= 2;
 	    INTUSE(_dl_argv) += 2;
 	  }
+	else if (! strcmp (INTUSE(_dl_argv)[1], "--rpath-prefix")
+		 && _dl_argc > 2)
+	  {
+	    GLRO(dl_rpath_prefix) = INTUSE(_dl_argv)[2];
+
+	    _dl_skip_args += 2;
+	    _dl_argc -= 2;
+	    INTUSE(_dl_argv) += 2;
+	  }
 	else if (! strcmp (INTUSE(_dl_argv)[1], "--audit") && _dl_argc > 2)
 	  {
 	    process_dl_audit (INTUSE(_dl_argv)[2]);
@@ -1038,6 +1047,7 @@
   --inhibit-cache       Do not use " LD_SO_CACHE "\n\
225 226
   --library-path PATH   use given PATH instead of content of the environment\n\
 			variable LD_LIBRARY_PATH\n\
Carsten Munk's avatar
Carsten Munk committed
227 228 229 230 231 232 233 234 235 236 237
+  --rpath-prefix PREFIX add PREFIX to every RUNPATH and RPATH component\n\
   --inhibit-rpath LIST  ignore RUNPATH and RPATH information in object names\n\
 			in LIST\n\
   --argv0 STRING        use STRING as argv[0]\n\
Only in eglibc-2.18-nodefaultdirs/elf: rtld.c.rej
diff -ru eglibc-2.18/sysdeps/generic/ldsodefs.h eglibc-2.18-nodefaultdirs/sysdeps/generic/ldsodefs.h
--- eglibc-2.18/sysdeps/generic/ldsodefs.h	2014-01-01 10:24:04.000000000 +0000
+++ eglibc-2.18-nodefaultdirs/sysdeps/generic/ldsodefs.h	2014-01-01 10:25:39.000000000 +0000
@@ -566,6 +566,8 @@
      platforms.  */
   EXTERN uint64_t _dl_hwcap2;
238 239 240 241
 
+  EXTERN int _dl_no_default_dirs;
+
 #ifdef SHARED
Carsten Munk's avatar
Carsten Munk committed
242 243
   /* We add a function table to _rtld_global which is then used to
      call the function instead of going through the PLT.  The result