This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch master updated. glibc-2.23-171-g0cdc5e9
- From: sthibaul at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 10 Apr 2016 21:59:15 -0000
- Subject: GNU C Library master sources branch master updated. glibc-2.23-171-g0cdc5e9
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 0cdc5e930a95ca2ec3f2fd9327da93a2fbaf8e97 (commit)
from 5057feffccb8970585e63b336e13fc878803af02 (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://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=0cdc5e930a95ca2ec3f2fd9327da93a2fbaf8e97
commit 0cdc5e930a95ca2ec3f2fd9327da93a2fbaf8e97
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Sun Apr 10 23:58:43 2016 +0200
Fix crash on getauxval call without HAVE_AUX_VECTOR
* sysdeps/generic/ldsodefs.h (struct rtld_global_ro)
[!HAVE_AUX_VECTOR]: Do not define _dl_auxv field.
* misc/getauxval.c (__getauxval) [!HAVE_AUX_VECTOR]: Do not go through
GLRO(dl_auxv) list.
diff --git a/ChangeLog b/ChangeLog
index 7a20eb3..fc5ffd8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2016-04-10 Samuel Thibault <samuel.thibault@ens-lyon.org>
+
+ * sysdeps/generic/ldsodefs.h (struct rtld_global_ro)
+ [!HAVE_AUX_VECTOR]: Do not define _dl_auxv field.
+ * misc/getauxval.c (__getauxval) [!HAVE_AUX_VECTOR]: Do not go through
+ GLRO(dl_auxv) list.
+
2016-04-09 Nick Alcock <nick.alcock@oracle.com>
* elf/rtld-Rules (rtld-compile-command.c): Add $(rtld-CFLAGS).
diff --git a/misc/getauxval.c b/misc/getauxval.c
index e48f40f..6111376 100644
--- a/misc/getauxval.c
+++ b/misc/getauxval.c
@@ -30,9 +30,11 @@ __getauxval (unsigned long int type)
else if (type == AT_HWCAP2)
return GLRO(dl_hwcap2);
+#ifdef HAVE_AUX_VECTOR
for (p = GLRO(dl_auxv); p->a_type != AT_NULL; p++)
if (p->a_type == type)
return p->a_un.a_val;
+#endif
__set_errno (ENOENT);
return 0;
diff --git a/sysdeps/generic/ldsodefs.h b/sysdeps/generic/ldsodefs.h
index 2733ac8..ddec0be 100644
--- a/sysdeps/generic/ldsodefs.h
+++ b/sysdeps/generic/ldsodefs.h
@@ -509,8 +509,10 @@ struct rtld_global_ro
/* Mask for important hardware capabilities we honour. */
EXTERN uint64_t _dl_hwcap_mask;
+#ifdef HAVE_AUX_VECTOR
/* Pointer to the auxv list supplied to the program at startup. */
EXTERN ElfW(auxv_t) *_dl_auxv;
+#endif
/* Get architecture specific definitions. */
#define PROCINFO_DECL
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 7 +++++++
misc/getauxval.c | 2 ++
sysdeps/generic/ldsodefs.h | 2 ++
3 files changed, 11 insertions(+), 0 deletions(-)
hooks/post-receive
--
GNU C Library master sources