GNU C Library master sources branch, master, updated. glibc-2.14-466-gc9aafac

[drepper at sourceware dot org]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".

The branch, master has been updated
       via  c9aafacee48275d85d86f25ab4569516f180846a (commit)
       via  d272e7f19dc2dae6d215f6ca6512d042575ed736 (commit)
       via  1bc3307181a2213a4d7253bced376c3de021605e (commit)
      from  1760874da6e4a6934751ea12cf2c06eae936b53c (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=c9aafacee48275d85d86f25ab4569516f180846a

commit c9aafacee48275d85d86f25ab4569516f180846a
Author: Ulrich Drepper <drepper@gmail.com>
Date:   Sat Oct 29 12:51:53 2011 -0400

    Correctly NUL-terminate link name in sprof

diff --git a/ChangeLog b/ChangeLog
index d5d7cb5..6cb54e6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2011-10-29  Ulrich Drepper  <drepper@gmail.com>
 
+	[BZ #13337]
+	* elf/sprof.c (load_shobj): Correctly NUL-terminate link name.
+	Patch by Thomas Jarosch <thomas.jarosch@intra2net.com>.
+
 	* elf/chroot_canon.c (chroot_canon): Cleanups.
 
 	* elf/dl-lookup.c (_dl_setup_hash): Avoid warning.
diff --git a/NEWS b/NEWS
index c9952a8..e4b9f44 100644
--- a/NEWS
+++ b/NEWS
@@ -12,7 +12,7 @@ Version 2.15
   6779, 6783, 9696, 11589, 12403, 12847, 12868, 12852, 12874, 12885, 12892,
   12907, 12922, 12935, 13007, 13021, 13067, 13068, 13090, 13092, 13114,
   13118, 13123, 13134, 13138, 13150, 13179, 13192, 13268, 13291, 13335,
-  13344
+  13337, 13344
 
 * New program pldd to list loaded object of a process
   Implemented by Ulrich Drepper.
diff --git a/elf/sprof.c b/elf/sprof.c
index dbe217b..069649a 100644
--- a/elf/sprof.c
+++ b/elf/sprof.c
@@ -596,10 +596,11 @@ load_shobj (const char *name)
       static const char procpath[] = "/proc/self/fd/%d";
       char origprocname[sizeof (procpath) + sizeof (int) * 3];
       snprintf (origprocname, sizeof (origprocname), procpath, fd);
-      char *origlink = (char *) alloca (PATH_MAX + 1);
-      origlink[PATH_MAX] = '\0';
-      if (readlink (origprocname, origlink, PATH_MAX) == -1)
+      char *origlink = (char *) alloca (PATH_MAX);
+      ssize_t n = readlink (origprocname, origlink, PATH_MAX)
+      if (n == -1)
 	goto no_debuginfo;
+      origlink[n] = '\0';
 
       /* Try to find the actual file.  There are three places:
 	 1. the same directory the DSO is in

http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=d272e7f19dc2dae6d215f6ca6512d042575ed736

commit d272e7f19dc2dae6d215f6ca6512d042575ed736
Author: Ulrich Drepper <drepper@gmail.com>
Date:   Sat Oct 29 12:43:18 2011 -0400

    Cleanups in ldconfig's chroot handling

diff --git a/ChangeLog b/ChangeLog
index fbef6bc..d5d7cb5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2011-10-29  Ulrich Drepper  <drepper@gmail.com>
 
+	* elf/chroot_canon.c (chroot_canon): Cleanups.
+
 	* elf/dl-lookup.c (_dl_setup_hash): Avoid warning.
 
 	[BZ #13335]
diff --git a/elf/chroot_canon.c b/elf/chroot_canon.c
index b639cfa..f8f3370 100644
--- a/elf/chroot_canon.c
+++ b/elf/chroot_canon.c
@@ -70,7 +70,6 @@ chroot_canon (const char *chroot, const char *name)
   for (start = end = name; *start; start = end)
     {
       struct stat64 st;
-      int n;
 
       /* Skip sequence of multiple path-separators.  */
       while (*start == '/')
@@ -135,7 +134,7 @@ chroot_canon (const char *chroot, const char *name)
 		  goto error;
 		}
 
-	      n = readlink (rpath, buf, PATH_MAX - 1);
+	      ssize_t n = readlink (rpath, buf, PATH_MAX - 1);
 	      if (n < 0)
 		{
 		  if (*end == '\0')
@@ -148,7 +147,7 @@ chroot_canon (const char *chroot, const char *name)
 		extra_buf = alloca (PATH_MAX);
 
 	      len = strlen (end);
-	      if ((long int) (n + len) >= PATH_MAX)
+	      if (len >= PATH_MAX - n)
 		{
 		  __set_errno (ENAMETOOLONG);
 		  goto error;

http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=1bc3307181a2213a4d7253bced376c3de021605e

commit 1bc3307181a2213a4d7253bced376c3de021605e
Author: Ulrich Drepper <drepper@gmail.com>
Date:   Sat Oct 29 12:40:55 2011 -0400

    Avoid warning in dl-lookup.c

diff --git a/ChangeLog b/ChangeLog
index 8e0c37c..fbef6bc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2011-10-29  Ulrich Drepper  <drepper@gmail.com>
 
+	* elf/dl-lookup.c (_dl_setup_hash): Avoid warning.
+
 	[BZ #13335]
 	* elf/chroot_canon.c (chroot_canon): Fix readlink call.
 	Patch by Thomas Jarosch <thomas.jarosch@intra2net.com>.
diff --git a/elf/dl-lookup.c b/elf/dl-lookup.c
index affb53f..e655d14 100644
--- a/elf/dl-lookup.c
+++ b/elf/dl-lookup.c
@@ -860,7 +860,6 @@ internal_function
 _dl_setup_hash (struct link_map *map)
 {
   Elf_Symndx *hash;
-  Elf_Symndx nchain;
 
   if (__builtin_expect (map->l_info[DT_ADDRTAGIDX (DT_GNU_HASH) + DT_NUM
 				    + DT_THISPROCNUM + DT_VERSIONTAGNUM
@@ -892,7 +891,8 @@ _dl_setup_hash (struct link_map *map)
   hash = (void *) D_PTR (map, l_info[DT_HASH]);
 
   map->l_nbuckets = *hash++;
-  nchain = *hash++;
+  /* Skip nchain.  */
+  hash++;
   map->l_buckets = hash;
   hash += map->l_nbuckets;
   map->l_chain = hash;

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog          |    8 ++++++++
 NEWS               |    2 +-
 elf/chroot_canon.c |    5 ++---
 elf/dl-lookup.c    |    4 ++--
 elf/sprof.c        |    7 ++++---
 5 files changed, 17 insertions(+), 9 deletions(-)


hooks/post-receive
-- 
GNU C Library master sources