From: Aurelien Jarno <aurelien@aurel32.net>
To: libc-stable@sourceware.org
Cc: "H.J. Lu" <hjl.tools@gmail.com>
Subject: [COMMITTED 2.25 1/8] i386: Hide __old_glob64 [BZ #18822]
Date: Sun, 01 Jan 2017 00:00:00 -0000 [thread overview]
Message-ID: <20171202095206.9955-1-aurelien@aurel32.net> (raw)
From: "H.J. Lu" <hjl.tools@gmail.com>
Hide internal __old_glob64 function to allow direct access within
libc.so and libc.a without using GOT nor PLT.
[BZ #18822]
* sysdeps/unix/sysv/linux/i386/glob64.c (__old_glob64): Add
libc_hidden_proto and libc_hidden_def.
(cherry picked from commit 2585d7b839559e665d5723734862fbe62264b25d)
---
ChangeLog | 6 ++++++
sysdeps/unix/sysv/linux/i386/glob64.c | 3 +++
2 files changed, 9 insertions(+)
diff --git a/ChangeLog b/ChangeLog
index ad563057d3..e6afed6c4e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2017-08-20 H.J. Lu <hongjiu.lu@intel.com>
+
+ [BZ #18822]
+ * sysdeps/unix/sysv/linux/i386/glob64.c (__old_glob64): Add
+ libc_hidden_proto and libc_hidden_def.
+
2017-03-14 Adhemerval Zanella <adhemerval.zanella@linaro.org>
[BZ #21232]
diff --git a/sysdeps/unix/sysv/linux/i386/glob64.c b/sysdeps/unix/sysv/linux/i386/glob64.c
index f68195137e..956cb0474a 100644
--- a/sysdeps/unix/sysv/linux/i386/glob64.c
+++ b/sysdeps/unix/sysv/linux/i386/glob64.c
@@ -53,6 +53,7 @@ libc_hidden_ver (__glob64, glob64)
int __old_glob64 (const char *__pattern, int __flags,
int (*__errfunc) (const char *, int),
glob64_t *__pglob);
+libc_hidden_proto (__old_glob64);
#undef dirent
#define dirent __old_dirent64
@@ -72,5 +73,7 @@ int __old_glob64 (const char *__pattern, int __flags,
#include <posix/glob.c>
+libc_hidden_def (__old_glob64);
+
compat_symbol (libc, __old_glob64, glob64, GLIBC_2_1);
#endif
--
2.15.0
next reply other threads:[~2017-12-02 9:52 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-01-01 0:00 Aurelien Jarno [this message]
2017-01-01 0:00 ` [COMMITTED 2.25 3/8] CVE-2017-15670: glob: Fix one-byte overflow [BZ #22320] Aurelien Jarno
2017-01-01 0:00 ` Dmitry V. Levin
2017-01-01 0:00 ` Aurelien Jarno
2017-01-01 0:00 ` [COMMITTED 2.25 6/8] glob: Fix buffer overflow during GLOB_TILDE unescaping [BZ #22332] Aurelien Jarno
2017-01-01 0:00 ` [COMMITTED 2.25 2/8] posix: Sync glob with gnulib [BZ #1062] Aurelien Jarno
2017-01-01 0:00 ` [COMMITTED 2.25 5/8] Update NEWS and ChangeLog for CVE-2017-15671 Aurelien Jarno
2017-01-01 0:00 ` [COMMITTED 2.25 8/8] Update NEWS to add CVE-2017-15804 entry Aurelien Jarno
2017-01-01 0:00 ` [COMMITTED 2.25 4/8] glob: Add new test tst-glob-tilde Aurelien Jarno
2017-01-01 0:00 ` [COMMITTED 2.25 7/8] posix/tst-glob-tilde.c: Add test for bug 22332 Aurelien Jarno
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20171202095206.9955-1-aurelien@aurel32.net \
--to=aurelien@aurel32.net \
--cc=hjl.tools@gmail.com \
--cc=libc-stable@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).