From 81b83ff61f95f30ad53d6075247af0ea61a0b16e Mon Sep 17 00:00:00 2001 From: Adhemerval Zanella Date: Tue, 21 Jul 2020 15:53:53 -0300 Subject: [PATCH] linux: Move xmknod{at} to compat symbols It also decouple mknod{at} from xmknod{at}. The riscv32 ABI was added on 2.33, so it is safe to remove the old __xmknot{at} symbols and just provide the newer mknod{at} ones. Checked with a build for all affected ABIs. I also checked on x86_64, i686, powerpc, powerpc64le, sparcv9, sparc64, s390, and s390x. Reviewed-by: Lukasz Majewski --- include/sys/stat.h | 4 +-- sysdeps/mach/hurd/xmknod.c | 17 ++++++--- sysdeps/mach/hurd/xmknodat.c | 12 ++++++- sysdeps/unix/sysv/linux/mknod.c | 28 +++++++++++++++ sysdeps/unix/sysv/linux/mknodat.c | 35 +++++++++++++++++++ .../unix/sysv/linux/riscv/rv32/libc.abilist | 2 -- sysdeps/unix/sysv/linux/xmknod.c | 20 ++++------- sysdeps/unix/sysv/linux/xmknodat.c | 23 ++++-------- 8 files changed, 101 insertions(+), 40 deletions(-) create mode 100644 sysdeps/unix/sysv/linux/mknod.c create mode 100644 sysdeps/unix/sysv/linux/mknodat.c diff --git a/include/sys/stat.h b/include/sys/stat.h index 9f7f3a8e3b..646a1622b3 100644 --- a/include/sys/stat.h +++ b/include/sys/stat.h @@ -80,10 +80,8 @@ libc_hidden_proto (__mknod); extern int __xmknod (int __ver, const char *__path, __mode_t __mode, __dev_t *__dev); -libc_hidden_proto (__xmknod) extern int __xmknodat (int __ver, int __fd, const char *__path, __mode_t __mode, __dev_t *__dev); -libc_hidden_proto (__xmknodat) int __fxstat (int __ver, int __fildes, struct stat *__stat_buf); int __xstat (int __ver, const char *__filename, @@ -109,6 +107,8 @@ hidden_proto (__xstat64); hidden_proto (__lxstat64); hidden_proto (__fxstatat64); # endif +libc_hidden_proto (__xmknod) +libc_hidden_proto (__xmknodat) # define stat(fname, buf) __xstat (_STAT_VER, fname, buf) # define lstat(fname, buf) __lxstat (_STAT_VER, fname, buf) # define __lstat(fname, buf) __lxstat (_STAT_VER, fname, buf) diff --git a/sysdeps/mach/hurd/xmknod.c b/sysdeps/mach/hurd/xmknod.c index 0ab4f1b719..a1b5af086d 100644 --- a/sysdeps/mach/hurd/xmknod.c +++ b/sysdeps/mach/hurd/xmknod.c @@ -15,12 +15,9 @@ License along with the GNU C Library; if not, see . */ -#include -#include -#include -#include #include - +#include +#include /* Create a device file named FILE_NAME, with permission and special bits MODE and device number DEV (which can be constructed from major and minor @@ -31,3 +28,13 @@ __xmknod (int vers, const char *file_name, mode_t mode, dev_t *dev) return __xmknodat (vers, AT_FDCWD, file_name, mode, dev); } libc_hidden_def (__xmknod) + +#if SHLIB_COMPAT(libc, GLIBC_2_0, GLIBC_2_33) +int +__xmknod_compat (int vers, const char *file_name, mode_t mode, dev_t *dev) +{ + return __xmknod (vers, file_name, mode, dev); +} + +compat_symbol (libc, __xmknod_compat, __xmknod, GLIBC_2_0); +#endif diff --git a/sysdeps/mach/hurd/xmknodat.c b/sysdeps/mach/hurd/xmknodat.c index 4239d1ea91..90724694d5 100644 --- a/sysdeps/mach/hurd/xmknodat.c +++ b/sysdeps/mach/hurd/xmknodat.c @@ -26,6 +26,7 @@ #include #include #include +#include /* Create a device file named PATH relative to FD, with permission and special bits MODE and device number DEV (which can be constructed @@ -116,5 +117,14 @@ __xmknodat (int vers, int fd, const char *path, mode_t mode, dev_t *dev) return __hurd_fail (err); return 0; } - libc_hidden_def (__xmknodat) + +#if SHLIB_COMPAT(libc, GLIBC_2_4, GLIBC_2_33) +int +__xmknodat_compat (int vers, int fd, const char *path, mode_t mode, dev_t *dev) +{ + return __xmknodat (vers, fd, path, mode, dev); +} + +compat_symbol (libc, __xmknodat_compat, __xmknodat, GLIBC_2_4); +#endif diff --git a/sysdeps/unix/sysv/linux/mknod.c b/sysdeps/unix/sysv/linux/mknod.c new file mode 100644 index 0000000000..7e290ddc8b --- /dev/null +++ b/sysdeps/unix/sysv/linux/mknod.c @@ -0,0 +1,28 @@ +/* Create a special or ordinary file. Linux version. + Copyright (C) 2020 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 + . */ + +#include +#include + +int +__mknod (const char *path, mode_t mode, dev_t dev) +{ + return __mknodat (AT_FDCWD, path, mode, dev); +} +libc_hidden_def (__mknod) +weak_alias (__mknod, mknod) diff --git a/sysdeps/unix/sysv/linux/mknodat.c b/sysdeps/unix/sysv/linux/mknodat.c new file mode 100644 index 0000000000..fdb8f1951a --- /dev/null +++ b/sysdeps/unix/sysv/linux/mknodat.c @@ -0,0 +1,35 @@ +/* Create a special or ordinary file. Linux version. + Copyright (C) 2020 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 + . */ + +#include +#include +#include + +int +__mknodat (int fd, const char *path, mode_t mode, dev_t dev) +{ + /* The user-exported dev_t is 64-bit while the kernel interface is + 32-bit. */ + unsigned int k_dev = dev; + if (k_dev != dev) + return INLINE_SYSCALL_ERROR_RETURN_VALUE (EINVAL); + + return INLINE_SYSCALL_CALL (mknodat, fd, path, mode, k_dev); +} +libc_hidden_def (__mknodat) +weak_alias (__mknodat, mknodat) diff --git a/sysdeps/unix/sysv/linux/riscv/rv32/libc.abilist b/sysdeps/unix/sysv/linux/riscv/rv32/libc.abilist index 91f8afed4b..36aa34a5e7 100644 --- a/sysdeps/unix/sysv/linux/riscv/rv32/libc.abilist +++ b/sysdeps/unix/sysv/linux/riscv/rv32/libc.abilist @@ -478,8 +478,6 @@ GLIBC_2.33 __wprintf_chk F GLIBC_2.33 __write F GLIBC_2.33 __wuflow F GLIBC_2.33 __wunderflow F -GLIBC_2.33 __xmknod F -GLIBC_2.33 __xmknodat F GLIBC_2.33 __xpg_basename F GLIBC_2.33 __xpg_sigpause F GLIBC_2.33 __xpg_strerror_r F diff --git a/sysdeps/unix/sysv/linux/xmknod.c b/sysdeps/unix/sysv/linux/xmknod.c index 42809d4c57..82bb0bd953 100644 --- a/sysdeps/unix/sysv/linux/xmknod.c +++ b/sysdeps/unix/sysv/linux/xmknod.c @@ -17,29 +17,23 @@ . */ #include -#include #include -#include +#include +#include +#if SHLIB_COMPAT(libc, GLIBC_2_0, GLIBC_2_33) /* Create a device file named PATH, with permission and special bits MODE and device number DEV (which can be constructed from major and minor device numbers with the `makedev' macro above). */ int +attribute_compat_text_section __xmknod (int vers, const char *path, mode_t mode, dev_t *dev) { - unsigned long long int k_dev; - if (vers != _MKNOD_VER) return INLINE_SYSCALL_ERROR_RETURN_VALUE (EINVAL); - /* We must convert the value to dev_t type used by the kernel. */ - k_dev = (*dev) & ((1ULL << 32) - 1); - if (k_dev != *dev) - return INLINE_SYSCALL_ERROR_RETURN_VALUE (EINVAL); - - return INLINE_SYSCALL_CALL (mknodat, AT_FDCWD, path, mode, - (unsigned int) k_dev); + return __mknodat (AT_FDCWD, path, mode, *dev); } -weak_alias (__xmknod, _xmknod) -libc_hidden_def (__xmknod) +compat_symbol (libc, __xmknod, __xmknod, GLIBC_2_0); +#endif diff --git a/sysdeps/unix/sysv/linux/xmknodat.c b/sysdeps/unix/sysv/linux/xmknodat.c index 5640a499aa..fae3fe54d1 100644 --- a/sysdeps/unix/sysv/linux/xmknodat.c +++ b/sysdeps/unix/sysv/linux/xmknodat.c @@ -15,18 +15,11 @@ License along with the GNU C Library; if not, see . */ -#include -#include -#include -#include -#include #include -#include - -#include -#include - +#include +#include +#if SHLIB_COMPAT(libc, GLIBC_2_4, GLIBC_2_33) /* Create a device file named PATH relative to FD, with permission and special bits MODE and device number DEV (which can be constructed from major and minor device numbers with the `makedev' macro above). */ @@ -36,12 +29,8 @@ __xmknodat (int vers, int fd, const char *file, mode_t mode, dev_t *dev) if (vers != _MKNOD_VER) return INLINE_SYSCALL_ERROR_RETURN_VALUE (EINVAL); - /* We must convert the value to dev_t type used by the kernel. */ - unsigned long long int k_dev = (*dev) & ((1ULL << 32) - 1); - if (k_dev != *dev) - return INLINE_SYSCALL_ERROR_RETURN_VALUE (EINVAL); - - return INLINE_SYSCALL (mknodat, 4, fd, file, mode, (unsigned int) k_dev); + return __mknodat (fd, file, mode, *dev); } -libc_hidden_def (__xmknodat) +compat_symbol (libc, __xmknodat, __xmknodat, GLIBC_2_4); +#endif