[42/58] Hide internal __ifreq function [BZ #18822]

Message ID	20170901180029.9527-43-hjl.tools@gmail.com
State	New
Headers	show Return-Path: <libc-alpha-return-84099-incoming=patchwork.ozlabs.org@sourceware.org> DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:subject:date:message-id:in-reply-to :references; q=dns; s=default; b=IfH89md/SjBRxavuF6KcQcEGiJFe3xb AfmiKHWzVg7MCdrxPrlBBq81cPiEEqjfnGN4J0BxkpUROn+WungB3QrCF8/RsqGz 3uxND6UbLs2wTQvngeFlFW8A5uDbNPlXcDX6elQaQpprkCiwvTZ2i4VcCXJzsUW0 7FVkwpCcLwIY= Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk Sender: libc-alpha-owner@sourceware.org From: "H.J. Lu" <hjl.tools@gmail.com> To: libc-alpha@sourceware.org Subject: [PATCH 42/58] Hide internal __ifreq function [BZ #18822] Date: Fri, 1 Sep 2017 11:00:13 -0700 Message-Id: <20170901180029.9527-43-hjl.tools@gmail.com> In-Reply-To: <20170901180029.9527-1-hjl.tools@gmail.com> References: <20170901180029.9527-1-hjl.tools@gmail.com>
Series	Hide internal functions in libc.so \| expand [00/58] Hide internal functions in libc.so [01/58] Mark internal functions with attribute_hidden [BZ #18822] [02/58] Mark 3 _internal functions with attribute_hidden [BZ #18822] [03/58] Mark __internal_statvfs[64] with attribute_hidden [BZ #18822] [04/58] Mark ____wcsto_l_internal functions with attribute_hidden [BZ #18822] [05/58] Mark internal argp functions with attribute_hidden [BZ #18822] [06/58] Mark internal unistd functions with attribute_hidden [BZ #18822] [07/58] Mark internal grp/pwd/shadow functions with attribute_hidden [BZ #18822] [08/58] Mark __dso_handle as hidden [BZ #18822] [09/58] Mark internal wchar functions with attribute_hidden [BZ #18822] [10/58] Mark internal gmp functions with attribute_hidden [BZ #18822] [11/58] Mark internal nscd functions with attribute_hidden [BZ #18822] [12/58] Mark internal time functions with attribute_hidden [BZ #18822] [13/58] Mark internal statfs functions with attribute_hidden [BZ #18822] [14/58] Mark internal gshadow functions with attribute_hidden [BZ #18822] [15/58] Mark internal stdio functions with attribute_hidden [BZ #18822] [16/58] Mark internal getXXXbyYYY functions with attribute_hidden [BZ #18822] [17/58] Mark internal dirent functions with attribute_hidden [BZ #18822] [18/58] Mark internal utmp functions with attribute_hidden [BZ #18822] [19/58] Mark internal stdlib functions with attribute_hidden [BZ #18822] [20/58] Hide internal regex functions [BZ #18822] [21/58] Hide __readv and __writev [BZ #18822] [22/58] Mark internal rpc functions with attribute_hidden [BZ #18822] [23/58] Mark internal netlink functions with attribute_hidden [BZ #18822] [24/58] Hide __chmod and __mkdir [BZ #18822] [25/58] Hide internal sysinfo functions [BZ #18822] [26/58] Mark internal intl functions with attribute_hidden [BZ #18822] [27/58] Hide internal __ioctl function [BZ #18822] [28/58] Hide internal __malloc_check_init function [BZ #18822] [29/58] Hide internal __mremap function [BZ #18822] [30/58] Hide __posix_spawn_file_actions_realloc/__spawni [BZ #18822] [31/58] Hide internal __strsep function [BZ #18822] [32/58] Hide internal signal functions [BZ #18822] [33/58] Hide internal __sysinfo function [BZ #18822] [34/58] Hide internal __assert_fail_base function [BZ #18822] [35/58] Hide internal __tdestroy function [BZ #18822] [36/58] Hide internal __fopen_maybe_mmap function [BZ #18822] [37/58] Hide internal __bsd_getpt function [BZ #18822] [38/58] Move hidden_proto (__dl_iterate_phdr) to include/link.h [BZ #18822] [39/58] Hide internal __get_sol function [BZ #18822] [40/58] Hide internal __gettextparse function [BZ #18822] [41/58] Hide internal idna functions [BZ #18822] [42/58] Hide internal __ifreq function [BZ #18822] [43/58] Hide internal __hasmntopt function [BZ #18822] [44/58] Hide internal __hash_string function [BZ #18822] [45/58] Hide internal __sched_setparam function [BZ #18822] [46/58] Hide internal __vstrfmon_l function [BZ #18822] [47/58] Hide internal __setrlimit function [BZ #18822] [48/58] Hide internal __tcgetattr function [BZ #18822] [49/58] Hide internal __nis_hash function [BZ #18822] [50/58] Hide internal __setfpucw function [BZ #18822] [51/58] Hide internal __init_misc function [BZ #18822] [52/58] Hide internal __libc_print_version function [BZ #18822] [53/58] Hide internal __moncontrol function [BZ #18822] [54/58] Hide internal __new_exitfn function [BZ #18822] [55/58] Hide internal __new_getrlimit function [BZ #18822] [56/58] Hide internal __glob64 function [BZ #18822] [57/58] Hide internal __sched_setaffinity_new function [BZ #18822] [58/58] Hide internal fadvise64/fallocate64 functions [BZ #18822]

Message ID

20170901180029.9527-43-hjl.tools@gmail.com

State

New

Headers

DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id
	:list-unsubscribe:list-subscribe:list-archive:list-post
	:list-help:sender:from:to:subject:date:message-id:in-reply-to
	:references; q=dns; s=default; b=IfH89md/SjBRxavuF6KcQcEGiJFe3xb
	AfmiKHWzVg7MCdrxPrlBBq81cPiEEqjfnGN4J0BxkpUROn+WungB3QrCF8/RsqGz
	3uxND6UbLs2wTQvngeFlFW8A5uDbNPlXcDX6elQaQpprkCiwvTZ2i4VcCXJzsUW0
	7FVkwpCcLwIY=
Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm
Precedence: bulk
Sender: libc-alpha-owner@sourceware.org
From: "H.J. Lu" <hjl.tools@gmail.com>
To: libc-alpha@sourceware.org
Subject: [PATCH 42/58] Hide internal __ifreq function [BZ #18822]
Date: Fri,  1 Sep 2017 11:00:13 -0700
Message-Id: <20170901180029.9527-43-hjl.tools@gmail.com>
In-Reply-To: <20170901180029.9527-1-hjl.tools@gmail.com>
References: <20170901180029.9527-1-hjl.tools@gmail.com>

Series

Hide internal functions in libc.so | expand

Commit Message

H.J. Lu Sept. 1, 2017, 6 p.m. UTC

Hide internal __ifreq function to allow direct access within libc.so and
libc.a without using GOT nor PLT.

	[BZ #18822]
	* include/ifreq.h: New file.
	* sysdeps/generic/ifreq.h (__if_nextreq): Removed.
	(__ifreq): Likewise.
	* sysdeps/mach/hurd/ifreq.h (__if_nextreq): Removed.
	(__ifreq): Likewise.
---
 include/ifreq.h           | 14 ++++++++++++++
 sysdeps/generic/ifreq.h   | 12 ------------
 sysdeps/mach/hurd/ifreq.h | 12 ------------
 3 files changed, 14 insertions(+), 24 deletions(-)
 create mode 100644 include/ifreq.h

Comments

H.J. Lu Oct. 2, 2017, 12:34 a.m. UTC | #1

On 9/1/17, H.J. Lu <hjl.tools@gmail.com> wrote:
> Hide internal __ifreq function to allow direct access within libc.so and
> libc.a without using GOT nor PLT.
>
> 	[BZ #18822]
> 	* include/ifreq.h: New file.
> 	* sysdeps/generic/ifreq.h (__if_nextreq): Removed.
> 	(__ifreq): Likewise.
> 	* sysdeps/mach/hurd/ifreq.h (__if_nextreq): Removed.
> 	(__ifreq): Likewise.
>

Tested with build-many-glibcs.py.  I am checking it in.

diff --git a/include/ifreq.h b/include/ifreq.h
new file mode 100644
index 0000000000..94e984c73c
--- /dev/null
+++ b/include/ifreq.h
@@ -0,0 +1,14 @@ 
+#include_next <ifreq.h>
+
+static inline struct ifreq *
+__if_nextreq (struct ifreq *ifr)
+{
+#ifdef _HAVE_SA_LEN
+  if (ifr->ifr_addr.sa_len > sizeof ifr->ifr_addr)
+    return (struct ifreq *) ((char *) &ifr->ifr_addr + ifr->ifr_addr.sa_len);
+#endif
+  return ifr + 1;
+}
+
+extern void __ifreq (struct ifreq **ifreqs, int *num_ifs, int sockfd)
+     attribute_hidden;
diff --git a/sysdeps/generic/ifreq.h b/sysdeps/generic/ifreq.h
index 6ebd7c83f3..b39739debb 100644
--- a/sysdeps/generic/ifreq.h
+++ b/sysdeps/generic/ifreq.h
@@ -23,18 +23,6 @@ 
 #include <sys/socket.h>
 #include <sys/ioctl.h>
 
-static inline struct ifreq *
-__if_nextreq (struct ifreq *ifr)
-{
-#ifdef _HAVE_SA_LEN
-  if (ifr->ifr_addr.sa_len > sizeof ifr->ifr_addr)
-    return (struct ifreq *) ((char *) &ifr->ifr_addr + ifr->ifr_addr.sa_len);
-#endif
-  return ifr + 1;
-}
-
-extern void __ifreq (struct ifreq **ifreqs, int *num_ifs, int sockfd);
-
 
 static inline void
 __if_freereq (struct ifreq *ifreqs, int num_ifs)
diff --git a/sysdeps/mach/hurd/ifreq.h b/sysdeps/mach/hurd/ifreq.h
index eceeb7a2c3..3dd17f773d 100644
--- a/sysdeps/mach/hurd/ifreq.h
+++ b/sysdeps/mach/hurd/ifreq.h
@@ -24,18 +24,6 @@ 
 #include <sys/ioctl.h>
 #include <sys/mman.h>
 
-static inline struct ifreq *
-__if_nextreq (struct ifreq *ifr)
-{
-#ifdef _HAVE_SA_LEN
-  if (ifr->ifr_addr.sa_len > sizeof ifr->ifr_addr)
-    return (struct ifreq *) ((char *) &ifr->ifr_addr + ifr->ifr_addr.sa_len);
-#endif
-  return ifr + 1;
-}
-
-extern void __ifreq (struct ifreq **ifreqs, int *num_ifs, int sockfd);
-
 
 static inline void
 __if_freereq (struct ifreq *ifreqs, int num_ifs)

[42/58] Hide internal __ifreq function [BZ #18822]

Commit Message

Comments

Patch