aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorH.J. Lu <hjl.tools@gmail.com>2017-10-01 16:12:08 -0700
committerH.J. Lu <hjl.tools@gmail.com>2017-10-01 16:12:24 -0700
commit8369d216dcc0e192e0e1243d9dad443e68f13f06 (patch)
tree835f87995ed4018b32ebb78a68be6d0ea3f27690
parenta0aef7830eb0698f72129b647be8c00cdf0c7938 (diff)
downloadglibc-8369d216dcc0e192e0e1243d9dad443e68f13f06.tar
glibc-8369d216dcc0e192e0e1243d9dad443e68f13f06.tar.gz
glibc-8369d216dcc0e192e0e1243d9dad443e68f13f06.tar.bz2
glibc-8369d216dcc0e192e0e1243d9dad443e68f13f06.zip
Hide internal __get_sol function [BZ #18822]
Hide internal __get_sol function to allow direct access within libc.so and libc.a without using GOT nor PLT. [BZ #18822] * sysdeps/unix/sysv/linux/getsourcefilter.c: Include "getsourcefilter.h". * sysdeps/unix/sysv/linux/getsourcefilter.h: New file. * sysdeps/unix/sysv/linux/setsourcefilter.c: Include "getsourcefilter.h". (__get_sol): Removed.
-rw-r--r--ChangeLog10
-rw-r--r--sysdeps/unix/sysv/linux/getsourcefilter.c1
-rw-r--r--sysdeps/unix/sysv/linux/getsourcefilter.h20
-rw-r--r--sysdeps/unix/sysv/linux/setsourcefilter.c5
4 files changed, 32 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 33177f2cee..e5edb868f3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,16 @@
2017-10-01 H.J. Lu <hongjiu.lu@intel.com>
[BZ #18822]
+ * sysdeps/unix/sysv/linux/getsourcefilter.c: Include
+ "getsourcefilter.h".
+ * sysdeps/unix/sysv/linux/getsourcefilter.h: New file.
+ * sysdeps/unix/sysv/linux/setsourcefilter.c: Include
+ "getsourcefilter.h".
+ (__get_sol): Removed.
+
+2017-10-01 H.J. Lu <hongjiu.lu@intel.com>
+
+ [BZ #18822]
* elf/dl-iteratephdr.c (hidden_proto (__dl_iterate_phdr)): Moved
to ...
* include/link.h (hidden_proto (__dl_iterate_phdr)): Here.
diff --git a/sysdeps/unix/sysv/linux/getsourcefilter.c b/sysdeps/unix/sysv/linux/getsourcefilter.c
index 806cb161e4..1465d69348 100644
--- a/sysdeps/unix/sysv/linux/getsourcefilter.c
+++ b/sysdeps/unix/sysv/linux/getsourcefilter.c
@@ -31,6 +31,7 @@
#include <netrose/rose.h>
#include <sys/param.h>
#include <sys/socket.h>
+#include "getsourcefilter.h"
static const struct
diff --git a/sysdeps/unix/sysv/linux/getsourcefilter.h b/sysdeps/unix/sysv/linux/getsourcefilter.h
new file mode 100644
index 0000000000..ac49290881
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/getsourcefilter.h
@@ -0,0 +1,20 @@
+/* __get_sol function prototype.
+ Copyright (C) 2017 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
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ The GNU C Library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with the GNU C Library; if not, see
+ <http://www.gnu.org/licenses/>. */
+
+/* Defined in getsourcefilter.c. */
+extern int __get_sol (int af, socklen_t len) attribute_hidden;
diff --git a/sysdeps/unix/sysv/linux/setsourcefilter.c b/sysdeps/unix/sysv/linux/setsourcefilter.c
index b4160ff4d8..ade424bbac 100644
--- a/sysdeps/unix/sysv/linux/setsourcefilter.c
+++ b/sysdeps/unix/sysv/linux/setsourcefilter.c
@@ -24,10 +24,7 @@
#include <stdint.h>
#include <netinet/in.h>
#include <sys/socket.h>
-
-
-/* Defined in getsourcefilter.c. */
-extern int __get_sol (int af, socklen_t len);
+#include "getsourcefilter.h"
int