diff mbox

RFA: [PATCH] Hide internal __ioctl function [BZ #18822]

Message ID 20170820185843.GA7287@gmail.com
State Committed
Commit 9e5ee8b839175b7f48d2e64e87d1e3da8fa6458f
Headers

Commit Message

H.J. Lu Aug. 20, 2017, 6:58 p.m. UTC 
  Hide internal __ioctl function to allow direct access within libc.so and
libc.a without using GOT nor PLT.

__GI___ioctl is defined when sysdeps/unix/syscalls.list is used to
generate ioctl.  Otherwise libc_hidden_def is needed explicitly.

Could someone please test it on hurd, aarch64, mips/mips64/n64, powerpc
and tilegx.

Thanks.

H.J.
---
	[BZ #18822]
	* include/sys/ioctl.h (__ioctl): Add libc_hidden_proto.
	* misc/ioctl.c (__ioctl): Add libc_hidden_def.
	* sysdeps/mach/hurd/ioctl.c (__ioctl): Likewise.
	* sysdeps/unix/sysv/linux/aarch64/ioctl.S (__ioctl): Likewise.
	* sysdeps/unix/sysv/linux/mips/mips64/n64/ioctl.S (__ioctl):
	Likewise.
	* sysdeps/unix/sysv/linux/powerpc/ioctl.c (__ioctl): Likewise.
	* sysdeps/unix/sysv/linux/tile/tilegx/ioctl.S (__ioctl): Likewise.
---
 include/sys/ioctl.h                             | 1 +
 misc/ioctl.c                                    | 1 +
 sysdeps/mach/hurd/ioctl.c                       | 1 +
 sysdeps/unix/sysv/linux/aarch64/ioctl.S         | 1 +
 sysdeps/unix/sysv/linux/mips/mips64/n64/ioctl.S | 1 +
 sysdeps/unix/sysv/linux/powerpc/ioctl.c         | 1 +
 sysdeps/unix/sysv/linux/tile/tilegx/ioctl.S     | 1 +
 7 files changed, 7 insertions(+)
diff mbox

Patch

diff --git a/include/sys/ioctl.h b/include/sys/ioctl.h
index bfc6909dbc..dd7c3c7c9c 100644
--- a/include/sys/ioctl.h
+++ b/include/sys/ioctl.h
@@ -5,6 +5,7 @@ 
 
 /* Now define the internal interfaces.  */
 extern int __ioctl (int __fd, unsigned long int __request, ...);
+libc_hidden_proto (__ioctl)
 
 # endif /* !_ISOMAC */
 #endif
diff --git a/misc/ioctl.c b/misc/ioctl.c
index 9b90102544..7e1c8cc4d7 100644
--- a/misc/ioctl.c
+++ b/misc/ioctl.c
@@ -28,4 +28,5 @@  __ioctl (int fd, unsigned long int request, ...)
 }
 stub_warning (ioctl)
 
+libc_hidden_def (__ioctl)
 weak_alias (__ioctl, ioctl)
diff --git a/sysdeps/mach/hurd/ioctl.c b/sysdeps/mach/hurd/ioctl.c
index 7ce521c4fa..d6b4583a6f 100644
--- a/sysdeps/mach/hurd/ioctl.c
+++ b/sysdeps/mach/hurd/ioctl.c
@@ -323,4 +323,5 @@  __ioctl (int fd, unsigned long int request, ...)
     }
 }
 
+libc_hidden_def (__ioctl)
 weak_alias (__ioctl, ioctl)
diff --git a/sysdeps/unix/sysv/linux/aarch64/ioctl.S b/sysdeps/unix/sysv/linux/aarch64/ioctl.S
index 866d6ef12d..61b3804e1b 100644
--- a/sysdeps/unix/sysv/linux/aarch64/ioctl.S
+++ b/sysdeps/unix/sysv/linux/aarch64/ioctl.S
@@ -28,4 +28,5 @@  ENTRY(__ioctl)
 	ret
 PSEUDO_END (__ioctl)
 
+libc_hidden_def (__ioctl)
 weak_alias (__ioctl, ioctl)
diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n64/ioctl.S b/sysdeps/unix/sysv/linux/mips/mips64/n64/ioctl.S
index ee5d11d240..54d186666d 100644
--- a/sysdeps/unix/sysv/linux/mips/mips64/n64/ioctl.S
+++ b/sysdeps/unix/sysv/linux/mips/mips64/n64/ioctl.S
@@ -38,4 +38,5 @@  L(error):
 
 PSEUDO_END (__ioctl)
 
+libc_hidden_def (__ioctl)
 weak_alias (__ioctl, ioctl)
diff --git a/sysdeps/unix/sysv/linux/powerpc/ioctl.c b/sysdeps/unix/sysv/linux/powerpc/ioctl.c
index 1437d1dccc..9efccbd2c5 100644
--- a/sysdeps/unix/sysv/linux/powerpc/ioctl.c
+++ b/sysdeps/unix/sysv/linux/powerpc/ioctl.c
@@ -61,4 +61,5 @@  __ioctl (int fd, unsigned long int request, ...)
 
   return result;
 }
+libc_hidden_def (__ioctl)
 weak_alias (__ioctl, ioctl)
diff --git a/sysdeps/unix/sysv/linux/tile/tilegx/ioctl.S b/sysdeps/unix/sysv/linux/tile/tilegx/ioctl.S
index e2bf44c75d..43f956399e 100644
--- a/sysdeps/unix/sysv/linux/tile/tilegx/ioctl.S
+++ b/sysdeps/unix/sysv/linux/tile/tilegx/ioctl.S
@@ -38,4 +38,5 @@  ENTRY (__ioctl)
 	BNEZ r1, 0f
 	jrp lr
 PSEUDO_END (__ioctl)
+libc_hidden_def (__ioctl)
 weak_alias (__ioctl, ioctl)