diff options
| author | H.J. Lu <hjl.tools@gmail.com> | 2017-06-08 12:52:42 -0700 |
|---|---|---|
| committer | H.J. Lu <hjl.tools@gmail.com> | 2017-06-08 12:52:42 -0700 |
| commit | 37b66c0b1a2156a43fb813499326230639ba2773 (patch) | |
| tree | b39f1559b927e4e0487d7da71a826e032560de03 /sysdeps | |
| parent | 199fc19d3aaaf57944ef036e15904febe877fc93 (diff) | |
| download | glibc-37b66c0b1a2156a43fb813499326230639ba2773.tar glibc-37b66c0b1a2156a43fb813499326230639ba2773.tar.gz glibc-37b66c0b1a2156a43fb813499326230639ba2773.tar.bz2 glibc-37b66c0b1a2156a43fb813499326230639ba2773.zip | |
ld.so: Consolidate 2 strtouls into _dl_strtoul [BZ #21528]
There are 2 minimal strtoul implementations in ld.so:
1. __strtoul_internal in elf/dl-minimal.c.
2. tunables_strtoul in elf/dl-tunables.c.
This patch adds _dl_strtoul to replace them. Tested builds with and
without --enable-tunables.
[BZ #21528]
* elf/dl-minimal.c (__strtoul_internal): Removed.
(strtoul): Likewise.
* elf/dl-misc.c (_dl_strtoul): New function.
* elf/dl-tunables.c (tunables_strtoul): Removed.
(tunable_initialize): Replace tunables_strtoul with _dl_strtoul.
* elf/rtld.c (process_envvars): Likewise.
* sysdeps/unix/sysv/linux/dl-librecon.h (_dl_osversion_init):
Likewise.
* sysdeps/generic/ldsodefs.h (_dl_strtoul): New prototype.
Diffstat (limited to 'sysdeps')
| -rw-r--r-- | sysdeps/generic/ldsodefs.h | 4 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/dl-librecon.h | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/sysdeps/generic/ldsodefs.h b/sysdeps/generic/ldsodefs.h index 695ac24c77..4508365871 100644 --- a/sysdeps/generic/ldsodefs.h +++ b/sysdeps/generic/ldsodefs.h @@ -254,6 +254,10 @@ extern int _dl_name_match_p (const char *__name, const struct link_map *__map) extern unsigned long int _dl_higher_prime_number (unsigned long int n) internal_function attribute_hidden; +/* A stripped down strtoul-like implementation. */ +uint64_t internal_function _dl_strtoul (const char *, char **) + internal_function attribute_hidden; + /* Function used as argument for `_dl_receive_error' function. The arguments are the error code, error string, and the objname the error occurred in. */ diff --git a/sysdeps/unix/sysv/linux/dl-librecon.h b/sysdeps/unix/sysv/linux/dl-librecon.h index a6e54bed75..e726ff29bb 100644 --- a/sysdeps/unix/sysv/linux/dl-librecon.h +++ b/sysdeps/unix/sysv/linux/dl-librecon.h @@ -28,7 +28,7 @@ _dl_osversion_init (char *assume_kernel) for (i = 0; i < 3; i++, p = q + 1) { - j = __strtoul_internal (p, &q, 0, 0); + j = _dl_strtoul (p, &q); if (j >= 255 || p == q || (i < 2 && *q && *q != '.')) { osversion = 0; |