Fix assertion when handling DSTs during auditing.

diff --git a/ChangeLog b/ChangeLog
index b969183..ee70519 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-01-12  Ulrich Drepper  <drepper@gmail.com>
+
+       * elf/dl-dst.h (DL_DST_REQUIRED): Allow l_origin to be NULL when
+       loader is ld.so.
+
 2011-01-10  Paul Pluzhnikov  <ppluzhnikov@google.com>
 
        * sysdeps/i386/Makefile: stdlib/cxa_finalize.c needs 16-byte stack

diff --git a/elf/dl-dst.h b/elf/dl-dst.h
index ae8d119..9d219e2 100644 (file)
--- a/elf/dl-dst.h
+++ b/elf/dl-dst.h
@@ -1,6 +1,5 @@
 /* Handling of dynamic sring tokens.
-   Copyright (C) 1999,2001,2002,2003,2004,2006,2007
-   Free Software Foundation, Inc.
+   Copyright (C) 1999,2001-2004,2006,2007,2011 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -33,6 +32,11 @@
     __cnt; })
 
 
+#ifdef SHARED
+# define IS_RTLD(l) (l) == &GL(dl_rtld_map)
+#else
+# define IS_RTLD(l) 0
+#endif
 /* Guess from the number of DSTs the length of the result string.  */
 #define DL_DST_REQUIRED(l, name, len, cnt) \
   ({                                                                         \
@@ -41,7 +45,7 @@
                                                                              \
     if (__cnt > 0)                                                           \
       {                                                                              \
-       size_t dst_len;                                                       \
+       size_t dst_len;                                                       \
        /* Now we make a guess how many extra characters on top of the        \
           length of S we need to represent the result.  We know that         \
           we have CNT replacements.  Each at most can use                    \
@@ -50,11 +54,12 @@
           minus 4 (which is the length of "$LIB").                           \
                                                                              \
           First get the origin string if it is not available yet.            \
-          This can only happen for the map of the executable.  */            \
+          This can only happen for the map of the executable or, when        \
+          auditing, in ld.so.  */                                            \
        DL_DST_REQ_STATIC (l)                                                 \
        if ((l)->l_origin == NULL)                                            \
          {                                                                   \
-           assert ((l)->l_name[0] == '\0');                                  \
+           assert ((l)->l_name[0] == '\0' || IS_RTLD (l));                   \
            (l)->l_origin = _dl_get_origin ();                                \
            dst_len = ((l)->l_origin && (l)->l_origin != (char *) -1          \
                          ? strlen ((l)->l_origin) : 0);                      \
@@ -62,7 +67,7 @@
        else                                                                  \
          dst_len = (l)->l_origin == (char *) -1                              \
            ? 0 : strlen ((l)->l_origin);                                     \
-       dst_len = MAX (MAX (dst_len, GLRO(dl_platformlen)),                   \
+       dst_len = MAX (MAX (dst_len, GLRO(dl_platformlen)),                   \
                       strlen (DL_DST_LIB));                                  \
        if (dst_len > 4)                                                      \
          __len += __cnt * (dst_len - 4);                                     \