From: Joseph Myers Date: Fri, 24 Oct 2014 12:57:59 +0000 (+0000) Subject: Move some chown / lchown / fchown definitions to syscalls.list (bug 14138). X-Git-Tag: glibc-2.21~472 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=48eb7a94e292efcbbd74902322252a99cbf74fb9;p=thirdparty%2Fglibc.git Move some chown / lchown / fchown definitions to syscalls.list (bug 14138). Continuing the move of syscall definitions to syscalls.list, where the removal of support for old kernel versions has made this possible, this patch moves various definitions of chown, lchown and fchown. In most cases the need for special syscalls.list entries (rather than existing generic ones) is because these architectures use chown32, lchown32 and fchown32 as syscall names. Some architectures also have symbol versioning compatibility for older versions of chown having been equivalent to lchown. The aliases specified for s390-32 had the effect of exporting __chown@@GLIBC_2.1 (but not __chown@GLIBC_2.0) despite it not being listed in Versions files. (I'm not sure why versioned_symbol but not compat_symbol were effective like that to create such __chown exports in the absence of Versions entries.) The natural way to preserve that versioned export of __chown seems to be to add it in a Versions file, so I did so. (Maybe actually it should be a compat symbol, __chown@GLIBC_2.1, unless there's a good reason for that export, but this patch doesn't change anything there.) Tested for x86. [BZ #14138] * sysdeps/unix/sysv/linux/i386/chown.c: Remove file. * sysdeps/unix/sysv/linux/i386/fchown.c: Likewise. * sysdeps/unix/sysv/linux/i386/lchown.c: Likewise. * sysdeps/unix/sysv/linux/s390/s390-32/chown.c: Likewise. * sysdeps/unix/sysv/linux/s390/s390-32/fchown.c: Remove file. * sysdeps/unix/sysv/linux/s390/s390-32/lchown.c: Likewise. * sysdeps/unix/sysv/linux/sh/chown.c: Likewise. * sysdeps/unix/sysv/linux/sh/fchown.c: Likewise. * sysdeps/unix/sysv/linux/sh/lchown.c: Likewise. * sysdeps/unix/sysv/linux/sparc/sparc32/chown.c: Likewise. * sysdeps/unix/sysv/linux/sparc/sparc32/fchown.c: Likewise. * sysdeps/unix/sysv/linux/sparc/sparc32/lchown.c: Likewise. * sysdeps/unix/sysv/linux/s390/s390-32/Versions (GLIBC_2.1): Add __chown. * sysdeps/unix/sysv/linux/i386/syscalls.list (chown): Add syscall. (lchown): Likewise. (fchown): Likewise. * sysdeps/unix/sysv/linux/s390/s390-32/syscalls.list (chown): Likewise. (lchown): Likewise. (fchown): Likewise. * sysdeps/unix/sysv/linux/sh/syscalls.list (chown): Likewise. (lchown): Likewise. (fchown): Likewise. * sysdeps/unix/sysv/linux/sparc/sparc32/syscalls.list (chown): Likewise. (lchown): Likewise. (fchown): Likewise. --- diff --git a/ChangeLog b/ChangeLog index 2b074e9ee66..2c73d153153 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,35 @@ +2014-10-24 Joseph Myers + + [BZ #14138] + * sysdeps/unix/sysv/linux/i386/chown.c: Remove file. + * sysdeps/unix/sysv/linux/i386/fchown.c: Likewise. + * sysdeps/unix/sysv/linux/i386/lchown.c: Likewise. + * sysdeps/unix/sysv/linux/s390/s390-32/chown.c: Likewise. + * sysdeps/unix/sysv/linux/s390/s390-32/fchown.c: Remove file. + * sysdeps/unix/sysv/linux/s390/s390-32/lchown.c: Likewise. + * sysdeps/unix/sysv/linux/sh/chown.c: Likewise. + * sysdeps/unix/sysv/linux/sh/fchown.c: Likewise. + * sysdeps/unix/sysv/linux/sh/lchown.c: Likewise. + * sysdeps/unix/sysv/linux/sparc/sparc32/chown.c: Likewise. + * sysdeps/unix/sysv/linux/sparc/sparc32/fchown.c: Likewise. + * sysdeps/unix/sysv/linux/sparc/sparc32/lchown.c: Likewise. + * sysdeps/unix/sysv/linux/s390/s390-32/Versions (GLIBC_2.1): Add + __chown. + * sysdeps/unix/sysv/linux/i386/syscalls.list (chown): Add syscall. + (lchown): Likewise. + (fchown): Likewise. + * sysdeps/unix/sysv/linux/s390/s390-32/syscalls.list (chown): + Likewise. + (lchown): Likewise. + (fchown): Likewise. + * sysdeps/unix/sysv/linux/sh/syscalls.list (chown): Likewise. + (lchown): Likewise. + (fchown): Likewise. + * sysdeps/unix/sysv/linux/sparc/sparc32/syscalls.list (chown): + Likewise. + (lchown): Likewise. + (fchown): Likewise. + 2014-10-23 Wilco Dijkstra * sysdeps/aarch64/fpu/feholdexcpt.c (feholdexcept): Remove spaces. diff --git a/sysdeps/unix/sysv/linux/i386/chown.c b/sysdeps/unix/sysv/linux/i386/chown.c deleted file mode 100644 index 4f63b2cc9e0..00000000000 --- a/sysdeps/unix/sysv/linux/i386/chown.c +++ /dev/null @@ -1,67 +0,0 @@ -/* Copyright (C) 1998-2014 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 -#include -#include - -#include - -/* - In Linux 2.1.x the chown functions have been changed. A new function lchown - was introduced. The new chown now follows symlinks - the old chown and the - new lchown do not follow symlinks. - The new lchown function has the same number as the old chown had and the - new chown has a new number. When compiling with headers from Linux > 2.1.8x - it's impossible to run this libc with older kernels. In these cases libc - has therefore to route calls to chown to the old chown function. -*/ - -extern int __chown_is_lchown (const char *__file, uid_t __owner, - gid_t __group); -extern int __real_chown (const char *__file, uid_t __owner, gid_t __group); - - -/* Consider moving to syscalls.list. */ - -int -__real_chown (const char *file, uid_t owner, gid_t group) -{ - return INLINE_SYSCALL (chown32, 3, file, owner, group); -} - - -#if SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_1) -/* Compiling for compatibility. */ -int -attribute_compat_text_section -__chown_is_lchown (const char *file, uid_t owner, gid_t group) -{ - return __lchown (file, owner, group); -} -#endif - -#if SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_1) -compat_symbol (libc, __chown_is_lchown, chown, GLIBC_2_0); -#endif - -versioned_symbol (libc, __real_chown, chown, GLIBC_2_1); -strong_alias (__real_chown, __chown) -libc_hidden_def (__chown) diff --git a/sysdeps/unix/sysv/linux/i386/fchown.c b/sysdeps/unix/sysv/linux/i386/fchown.c deleted file mode 100644 index 7fbfd930c6f..00000000000 --- a/sysdeps/unix/sysv/linux/i386/fchown.c +++ /dev/null @@ -1,34 +0,0 @@ -/* Copyright (C) 2000-2014 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 -#include - -#include - -/* Consider moving to syscalls.list. */ - -int -__fchown (int fd, uid_t owner, gid_t group) -{ - return INLINE_SYSCALL (fchown32, 3, fd, owner, group); -} - -weak_alias (__fchown, fchown) diff --git a/sysdeps/unix/sysv/linux/i386/lchown.c b/sysdeps/unix/sysv/linux/i386/lchown.c deleted file mode 100644 index cfa7e97a2e7..00000000000 --- a/sysdeps/unix/sysv/linux/i386/lchown.c +++ /dev/null @@ -1,34 +0,0 @@ -/* Copyright (C) 2000-2014 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 -#include - -#include - -/* Consider moving to syscalls.list. */ - -int -__lchown (const char *file, uid_t owner, gid_t group) -{ - return INLINE_SYSCALL (lchown32, 3, file, owner, group); -} - -weak_alias (__lchown, lchown) diff --git a/sysdeps/unix/sysv/linux/i386/syscalls.list b/sysdeps/unix/sysv/linux/i386/syscalls.list index 0d3eabee64d..db375a8b6b4 100644 --- a/sysdeps/unix/sysv/linux/i386/syscalls.list +++ b/sysdeps/unix/sysv/linux/i386/syscalls.list @@ -1,5 +1,9 @@ # File name Caller Syscall name Args Strong name Weak names +chown - chown32 i:sii __chown chown@@GLIBC_2.1 +lchown - lchown32 i:sii __lchown lchown@@GLIBC_2.0 chown@GLIBC_2.0 +fchown - fchown32 i:iii __fchown fchown + modify_ldt EXTRA modify_ldt i:ipi __modify_ldt modify_ldt vm86old EXTRA vm86old i:p __vm86old vm86@GLIBC_2.0 vm86 - vm86 i:ip __vm86 vm86@@GLIBC_2.3.4 diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/Versions b/sysdeps/unix/sysv/linux/s390/s390-32/Versions index 24e0b1d4cd4..1c120e8cbea 100644 --- a/sysdeps/unix/sysv/linux/s390/s390-32/Versions +++ b/sysdeps/unix/sysv/linux/s390/s390-32/Versions @@ -4,6 +4,9 @@ libc { __register_frame; __register_frame_table; __deregister_frame; __frame_state_for; __register_frame_info_table; } + GLIBC_2.1 { + __chown; + } GLIBC_2.2 { # functions used in other libraries __xstat64; __fxstat64; __lxstat64; diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/chown.c b/sysdeps/unix/sysv/linux/s390/s390-32/chown.c deleted file mode 100644 index 1fee84af1f7..00000000000 --- a/sysdeps/unix/sysv/linux/s390/s390-32/chown.c +++ /dev/null @@ -1,71 +0,0 @@ -/* Copyright (C) 2000-2014 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 -#include -#include - -#include - -/* - In Linux 2.1.x the chown functions have been changed. A new function lchown - was introduced. The new chown now follows symlinks - the old chown and the - new lchown do not follow symlinks. - The new lchown function has the same number as the old chown had and the - new chown has a new number. When compiling with headers from Linux > 2.1.8x - it's impossible to run this libc with older kernels. In these cases libc - has therefore to route calls to chown to the old chown function. -*/ - -/* Running under Linux > 2.1.80. */ - -/* Consider moving to syscalls.list. */ - -int -__real_chown (const char *file, uid_t owner, gid_t group) -{ - return INLINE_SYSCALL (chown32, 3, file, owner, group); -} - - -#if SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_1) -/* Compiling for compatibility. */ -int -attribute_compat_text_section -__chown_is_lchown (const char *file, uid_t owner, gid_t group) -{ - return __lchown (file, owner, group); -} -#endif - -#if SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_1) -strong_alias (__chown_is_lchown, _chown_is_lchown) -compat_symbol (libc, __chown_is_lchown, __chown, GLIBC_2_0); -compat_symbol (libc, _chown_is_lchown, chown, GLIBC_2_0); - -strong_alias (__real_chown, _real_chown) -versioned_symbol (libc, __real_chown, __chown, GLIBC_2_1); -versioned_symbol (libc, _real_chown, chown, GLIBC_2_1); -libc_hidden_ver (__real_chown, __chown) -#else -strong_alias (__real_chown, __chown) -libc_hidden_def (__chown) -weak_alias (__real_chown, chown) -#endif diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/fchown.c b/sysdeps/unix/sysv/linux/s390/s390-32/fchown.c deleted file mode 100644 index 3a69ecc9e7d..00000000000 --- a/sysdeps/unix/sysv/linux/s390/s390-32/fchown.c +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/lchown.c b/sysdeps/unix/sysv/linux/s390/s390-32/lchown.c deleted file mode 100644 index cfa7e97a2e7..00000000000 --- a/sysdeps/unix/sysv/linux/s390/s390-32/lchown.c +++ /dev/null @@ -1,34 +0,0 @@ -/* Copyright (C) 2000-2014 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 -#include - -#include - -/* Consider moving to syscalls.list. */ - -int -__lchown (const char *file, uid_t owner, gid_t group) -{ - return INLINE_SYSCALL (lchown32, 3, file, owner, group); -} - -weak_alias (__lchown, lchown) diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/syscalls.list b/sysdeps/unix/sysv/linux/s390/s390-32/syscalls.list index 902491c6dd6..7a6015af9f8 100644 --- a/sysdeps/unix/sysv/linux/s390/s390-32/syscalls.list +++ b/sysdeps/unix/sysv/linux/s390/s390-32/syscalls.list @@ -1,5 +1,9 @@ # File name Caller Syscall name Args Strong name Weak names +chown - chown32 i:sii __chown chown@@GLIBC_2.1 +lchown - lchown32 i:sii __lchown lchown@@GLIBC_2.0 chown@GLIBC_2.0 +fchown - fchown32 i:iii __fchown fchown + oldgetrlimit EXTRA getrlimit i:ip __old_getrlimit getrlimit@GLIBC_2.0 setrlimit - setrlimit i:ip __setrlimit setrlimit@GLIBC_2.0 setrlimit@@GLIBC_2.2 diff --git a/sysdeps/unix/sysv/linux/sh/chown.c b/sysdeps/unix/sysv/linux/sh/chown.c deleted file mode 100644 index 27be894a5b8..00000000000 --- a/sysdeps/unix/sysv/linux/sh/chown.c +++ /dev/null @@ -1,34 +0,0 @@ -/* Copyright (C) 1998-2014 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 -#include - -#include - -/* Consider moving to syscalls.list. */ - -int -__chown (const char *file, uid_t owner, gid_t group) -{ - return INLINE_SYSCALL (chown32, 3, file, owner, group); -} -libc_hidden_def (__chown) -weak_alias (__chown, chown) diff --git a/sysdeps/unix/sysv/linux/sh/fchown.c b/sysdeps/unix/sysv/linux/sh/fchown.c deleted file mode 100644 index 3a69ecc9e7d..00000000000 --- a/sysdeps/unix/sysv/linux/sh/fchown.c +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/sysdeps/unix/sysv/linux/sh/lchown.c b/sysdeps/unix/sysv/linux/sh/lchown.c deleted file mode 100644 index c89de99ba23..00000000000 --- a/sysdeps/unix/sysv/linux/sh/lchown.c +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/sysdeps/unix/sysv/linux/sh/syscalls.list b/sysdeps/unix/sysv/linux/sh/syscalls.list index faffe377e18..899d4e7afea 100644 --- a/sysdeps/unix/sysv/linux/sh/syscalls.list +++ b/sysdeps/unix/sysv/linux/sh/syscalls.list @@ -1,5 +1,9 @@ # File name Caller Syscall name # args Strong name Weak names +chown - chown32 i:sii __chown chown +lchown - lchown32 i:sii __lchown lchown +fchown - fchown32 i:iii __fchown fchown + waitpid - waitpid Ci:ipi __waitpid waitpid __libc_waitpid prlimit64 EXTRA prlimit64 i:iipp prlimit64 diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/chown.c b/sysdeps/unix/sysv/linux/sparc/sparc32/chown.c deleted file mode 100644 index 374131695c1..00000000000 --- a/sysdeps/unix/sysv/linux/sparc/sparc32/chown.c +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/fchown.c b/sysdeps/unix/sysv/linux/sparc/sparc32/fchown.c deleted file mode 100644 index 3a69ecc9e7d..00000000000 --- a/sysdeps/unix/sysv/linux/sparc/sparc32/fchown.c +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/lchown.c b/sysdeps/unix/sysv/linux/sparc/sparc32/lchown.c deleted file mode 100644 index c89de99ba23..00000000000 --- a/sysdeps/unix/sysv/linux/sparc/sparc32/lchown.c +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/syscalls.list b/sysdeps/unix/sysv/linux/sparc/sparc32/syscalls.list index 3d70185474c..e71a044028a 100644 --- a/sysdeps/unix/sysv/linux/sparc/sparc32/syscalls.list +++ b/sysdeps/unix/sysv/linux/sparc/sparc32/syscalls.list @@ -1,5 +1,9 @@ # File name Caller Syscall name # args Strong name Weak names +chown - chown32 i:sii __chown chown +lchown - lchown32 i:sii __lchown lchown +fchown - fchown32 i:iii __fchown fchown + setrlimit - setrlimit 2 __setrlimit setrlimit getrlimit - getrlimit 2 __getrlimit getrlimit getresuid - getresuid32 3 getresuid