mirror of
https://sourceware.org/git/glibc.git
synced 2024-09-21 09:00:10 +00:00
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.
This commit is contained in:
Joseph Myers
parent
eb04247d5d
commit
48eb7a94e2
32
ChangeLog
32
ChangeLog
@ -1,3 +1,35 @@
|
||||
2014-10-24 Joseph Myers <joseph@codesourcery.com>
|
||||
|
||||
[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 <wdijkstr@arm.com>
|
||||
|
||||
* sysdeps/aarch64/fpu/feholdexcpt.c (feholdexcept): Remove spaces.
|
||||
|
||||
@ -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
|
||||
<http://www.gnu.org/licenses/>. */
|
||||
|
||||
#include <errno.h>
|
||||
#include <unistd.h>
|
||||
|
||||
#include <sysdep.h>
|
||||
#include <sys/syscall.h>
|
||||
#include <shlib-compat.h>
|
||||
|
||||
#include <linux/posix_types.h>
|
||||
|
||||
/*
|
||||
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)
|
||||
@ -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
|
||||
<http://www.gnu.org/licenses/>. */
|
||||
|
||||
#include <errno.h>
|
||||
#include <unistd.h>
|
||||
|
||||
#include <sysdep.h>
|
||||
#include <sys/syscall.h>
|
||||
|
||||
#include <linux/posix_types.h>
|
||||
|
||||
/* 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)
|
||||
@ -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
|
||||
<http://www.gnu.org/licenses/>. */
|
||||
|
||||
#include <errno.h>
|
||||
#include <unistd.h>
|
||||
|
||||
#include <sysdep.h>
|
||||
#include <sys/syscall.h>
|
||||
|
||||
#include <linux/posix_types.h>
|
||||
|
||||
/* 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)
|
||||
@ -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
|
||||
|
||||
@ -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;
|
||||
|
||||
@ -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
|
||||
<http://www.gnu.org/licenses/>. */
|
||||
|
||||
#include <errno.h>
|
||||
#include <unistd.h>
|
||||
|
||||
#include <sysdep.h>
|
||||
#include <sys/syscall.h>
|
||||
#include <shlib-compat.h>
|
||||
|
||||
#include <linux/posix_types.h>
|
||||
|
||||
/*
|
||||
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
|
||||
@ -1 +0,0 @@
|
||||
#include <sysdeps/unix/sysv/linux/i386/fchown.c>
|
||||
@ -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
|
||||
<http://www.gnu.org/licenses/>. */
|
||||
|
||||
#include <errno.h>
|
||||
#include <unistd.h>
|
||||
|
||||
#include <sysdep.h>
|
||||
#include <sys/syscall.h>
|
||||
|
||||
#include <linux/posix_types.h>
|
||||
|
||||
/* 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)
|
||||
@ -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
|
||||
|
||||
|
||||
@ -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
|
||||
<http://www.gnu.org/licenses/>. */
|
||||
|
||||
#include <errno.h>
|
||||
#include <unistd.h>
|
||||
|
||||
#include <sysdep.h>
|
||||
#include <sys/syscall.h>
|
||||
|
||||
#include <linux/posix_types.h>
|
||||
|
||||
/* 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)
|
||||
@ -1 +0,0 @@
|
||||
#include <sysdeps/unix/sysv/linux/i386/fchown.c>
|
||||
@ -1 +0,0 @@
|
||||
#include <sysdeps/unix/sysv/linux/i386/lchown.c>
|
||||
@ -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
|
||||
|
||||
@ -1 +0,0 @@
|
||||
#include <sysdeps/unix/sysv/linux/sh/chown.c>
|
||||
@ -1 +0,0 @@
|
||||
#include <sysdeps/unix/sysv/linux/i386/fchown.c>
|
||||
@ -1 +0,0 @@
|
||||
#include <sysdeps/unix/sysv/linux/i386/lchown.c>
|
||||
@ -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
|
||||
|
||||
Loading…
Reference in New Issue
Block a user