diff options
| author | Joseph Myers <joseph@codesourcery.com> | 2014-10-24 13:01:17 +0000 |
|---|---|---|
| committer | Joseph Myers <joseph@codesourcery.com> | 2014-10-24 13:01:17 +0000 |
| commit | c8bc40386ad9767e1e4de882182b91ae57ca211c (patch) | |
| tree | 4240d5071566091d930e233aaba3db3261e765cd | |
| parent | 48eb7a94e292efcbbd74902322252a99cbf74fb9 (diff) | |
| download | glibc-c8bc40386ad9767e1e4de882182b91ae57ca211c.tar.xz glibc-c8bc40386ad9767e1e4de882182b91ae57ca211c.zip | |
Move get*id and getgroups 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 get*id functions and
getgroups. The previous C definitions were because of the transition
to 32-bit uids and gids.
Tested for x86.
[BZ #14138]
* sysdeps/unix/sysv/linux/arm/getegid.c: Remove file.
* sysdeps/unix/sysv/linux/arm/geteuid.c: Likewise.
* sysdeps/unix/sysv/linux/arm/getgid.c: Likewise.
* sysdeps/unix/sysv/linux/arm/getgroups.c: Likewise.
* sysdeps/unix/sysv/linux/arm/getresgid.c: Likewise.
* sysdeps/unix/sysv/linux/arm/getresuid.c: Likewise.
* sysdeps/unix/sysv/linux/arm/getuid.c: Likewise.
* sysdeps/unix/sysv/linux/i386/getegid.c: Likewise.
* sysdeps/unix/sysv/linux/i386/geteuid.c: Likewise.
* sysdeps/unix/sysv/linux/i386/getgid.c: Likewise.
* sysdeps/unix/sysv/linux/i386/getgroups.c: Likewise.
* sysdeps/unix/sysv/linux/i386/getresgid.c: Likewise.
* sysdeps/unix/sysv/linux/i386/getresuid.c: Likewise.
* sysdeps/unix/sysv/linux/i386/getuid.c: Likewise.
* sysdeps/unix/sysv/linux/m68k/getegid.c: Likewise.
* sysdeps/unix/sysv/linux/m68k/geteuid.c: Likewise.
* sysdeps/unix/sysv/linux/m68k/getgid.c: Likewise.
* sysdeps/unix/sysv/linux/m68k/getgroups.c: Likewise.
* sysdeps/unix/sysv/linux/m68k/getresgid.c: Likewise.
* sysdeps/unix/sysv/linux/m68k/getresuid.c: Likewise.
* sysdeps/unix/sysv/linux/m68k/getuid.c: Likewise.
* sysdeps/unix/sysv/linux/s390/s390-32/getegid.c: Likewise.
* sysdeps/unix/sysv/linux/s390/s390-32/geteuid.c: Likewise.
* sysdeps/unix/sysv/linux/s390/s390-32/getgid.c: Likewise.
* sysdeps/unix/sysv/linux/s390/s390-32/getgroups.c: Likewise.
* sysdeps/unix/sysv/linux/s390/s390-32/getresgid.c: Likewise.
* sysdeps/unix/sysv/linux/s390/s390-32/getresuid.c: Likewise.
* sysdeps/unix/sysv/linux/s390/s390-32/getuid.c: Likewise.
* sysdeps/unix/sysv/linux/sh/getegid.c: Likewise.
* sysdeps/unix/sysv/linux/sh/geteuid.c: Likewise.
* sysdeps/unix/sysv/linux/sh/getgid.c: Likewise.
* sysdeps/unix/sysv/linux/sh/getgroups.c: Likewise.
* sysdeps/unix/sysv/linux/sh/getresgid.c: Likewise.
* sysdeps/unix/sysv/linux/sh/getresuid.c: Likewise.
* sysdeps/unix/sysv/linux/sh/getuid.c: Likewise.
* sysdeps/unix/sysv/linux/sparc/sparc32/getegid.c: Likewise.
* sysdeps/unix/sysv/linux/sparc/sparc32/geteuid.c: Likewise.
* sysdeps/unix/sysv/linux/sparc/sparc32/getgid.c: Likewise.
* sysdeps/unix/sysv/linux/sparc/sparc32/getgroups.c: Likewise.
* sysdeps/unix/sysv/linux/sparc/sparc32/getuid.c: Likewise.
* sysdeps/unix/sysv/linux/arm/syscalls.list (getegid): Add
syscall.
(geteuid): Likewise.
(getgid): Likewise.
(getuid): Likewise.
(getresgid): Likewise.
(getresuid): Likewise.
(getgroups): Likewise.
* sysdeps/unix/sysv/linux/i386/syscalls.list (getegid): Likewise.
(geteuid): Likewise.
(getgid): Likewise.
(getuid): Likewise.
(getresgid): Likewise.
(getresuid): Likewise.
(getgroups): Likewise.
* sysdeps/unix/sysv/linux/m68k/syscalls.list (getegid): Likewise.
(geteuid): Likewise.
(getgid): Likewise.
(getuid): Likewise.
(getresgid): Likewise.
(getresuid): Likewise.
(getgroups): Likewise.
* sysdeps/unix/sysv/linux/s390/s390-32/syscalls.list (getegid):
Likewise.
(geteuid): Likewise.
(getgid): Likewise.
(getuid): Likewise.
(getresgid): Likewise.
(getresuid): Likewise.
(getgroups): Likewise.
* sysdeps/unix/sysv/linux/sh/syscalls.list (getegid): Likewise.
(geteuid): Likewise.
(getgid): Likewise.
(getuid): Likewise.
(getresgid): Likewise.
(getresuid): Likewise.
(getgroups): Likewise.
* sysdeps/unix/sysv/linux/sparc/sparc32/syscalls.list (getegid):
Likewise.
(geteuid): Likewise.
(getgid): Likewise.
(getuid): Likewise.
(getgroups): Likewise.
47 files changed, 130 insertions, 278 deletions
@@ -1,6 +1,91 @@ 2014-10-24 Joseph Myers <joseph@codesourcery.com> [BZ #14138] + * sysdeps/unix/sysv/linux/arm/getegid.c: Remove file. + * sysdeps/unix/sysv/linux/arm/geteuid.c: Likewise. + * sysdeps/unix/sysv/linux/arm/getgid.c: Likewise. + * sysdeps/unix/sysv/linux/arm/getgroups.c: Likewise. + * sysdeps/unix/sysv/linux/arm/getresgid.c: Likewise. + * sysdeps/unix/sysv/linux/arm/getresuid.c: Likewise. + * sysdeps/unix/sysv/linux/arm/getuid.c: Likewise. + * sysdeps/unix/sysv/linux/i386/getegid.c: Likewise. + * sysdeps/unix/sysv/linux/i386/geteuid.c: Likewise. + * sysdeps/unix/sysv/linux/i386/getgid.c: Likewise. + * sysdeps/unix/sysv/linux/i386/getgroups.c: Likewise. + * sysdeps/unix/sysv/linux/i386/getresgid.c: Likewise. + * sysdeps/unix/sysv/linux/i386/getresuid.c: Likewise. + * sysdeps/unix/sysv/linux/i386/getuid.c: Likewise. + * sysdeps/unix/sysv/linux/m68k/getegid.c: Likewise. + * sysdeps/unix/sysv/linux/m68k/geteuid.c: Likewise. + * sysdeps/unix/sysv/linux/m68k/getgid.c: Likewise. + * sysdeps/unix/sysv/linux/m68k/getgroups.c: Likewise. + * sysdeps/unix/sysv/linux/m68k/getresgid.c: Likewise. + * sysdeps/unix/sysv/linux/m68k/getresuid.c: Likewise. + * sysdeps/unix/sysv/linux/m68k/getuid.c: Likewise. + * sysdeps/unix/sysv/linux/s390/s390-32/getegid.c: Likewise. + * sysdeps/unix/sysv/linux/s390/s390-32/geteuid.c: Likewise. + * sysdeps/unix/sysv/linux/s390/s390-32/getgid.c: Likewise. + * sysdeps/unix/sysv/linux/s390/s390-32/getgroups.c: Likewise. + * sysdeps/unix/sysv/linux/s390/s390-32/getresgid.c: Likewise. + * sysdeps/unix/sysv/linux/s390/s390-32/getresuid.c: Likewise. + * sysdeps/unix/sysv/linux/s390/s390-32/getuid.c: Likewise. + * sysdeps/unix/sysv/linux/sh/getegid.c: Likewise. + * sysdeps/unix/sysv/linux/sh/geteuid.c: Likewise. + * sysdeps/unix/sysv/linux/sh/getgid.c: Likewise. + * sysdeps/unix/sysv/linux/sh/getgroups.c: Likewise. + * sysdeps/unix/sysv/linux/sh/getresgid.c: Likewise. + * sysdeps/unix/sysv/linux/sh/getresuid.c: Likewise. + * sysdeps/unix/sysv/linux/sh/getuid.c: Likewise. + * sysdeps/unix/sysv/linux/sparc/sparc32/getegid.c: Likewise. + * sysdeps/unix/sysv/linux/sparc/sparc32/geteuid.c: Likewise. + * sysdeps/unix/sysv/linux/sparc/sparc32/getgid.c: Likewise. + * sysdeps/unix/sysv/linux/sparc/sparc32/getgroups.c: Likewise. + * sysdeps/unix/sysv/linux/sparc/sparc32/getuid.c: Likewise. + * sysdeps/unix/sysv/linux/arm/syscalls.list (getegid): Add + syscall. + (geteuid): Likewise. + (getgid): Likewise. + (getuid): Likewise. + (getresgid): Likewise. + (getresuid): Likewise. + (getgroups): Likewise. + * sysdeps/unix/sysv/linux/i386/syscalls.list (getegid): Likewise. + (geteuid): Likewise. + (getgid): Likewise. + (getuid): Likewise. + (getresgid): Likewise. + (getresuid): Likewise. + (getgroups): Likewise. + * sysdeps/unix/sysv/linux/m68k/syscalls.list (getegid): Likewise. + (geteuid): Likewise. + (getgid): Likewise. + (getuid): Likewise. + (getresgid): Likewise. + (getresuid): Likewise. + (getgroups): Likewise. + * sysdeps/unix/sysv/linux/s390/s390-32/syscalls.list (getegid): + Likewise. + (geteuid): Likewise. + (getgid): Likewise. + (getuid): Likewise. + (getresgid): Likewise. + (getresuid): Likewise. + (getgroups): Likewise. + * sysdeps/unix/sysv/linux/sh/syscalls.list (getegid): Likewise. + (geteuid): Likewise. + (getgid): Likewise. + (getuid): Likewise. + (getresgid): Likewise. + (getresuid): Likewise. + (getgroups): Likewise. + * sysdeps/unix/sysv/linux/sparc/sparc32/syscalls.list (getegid): + Likewise. + (geteuid): Likewise. + (getgid): Likewise. + (getuid): Likewise. + (getgroups): Likewise. + + [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. diff --git a/sysdeps/unix/sysv/linux/arm/getegid.c b/sysdeps/unix/sysv/linux/arm/getegid.c deleted file mode 100644 index 37b4b4a530..0000000000 --- a/sysdeps/unix/sysv/linux/arm/getegid.c +++ /dev/null @@ -1 +0,0 @@ -#include <sysdeps/unix/sysv/linux/i386/getegid.c> diff --git a/sysdeps/unix/sysv/linux/arm/geteuid.c b/sysdeps/unix/sysv/linux/arm/geteuid.c deleted file mode 100644 index ebcb555b5e..0000000000 --- a/sysdeps/unix/sysv/linux/arm/geteuid.c +++ /dev/null @@ -1 +0,0 @@ -#include <sysdeps/unix/sysv/linux/i386/geteuid.c> diff --git a/sysdeps/unix/sysv/linux/arm/getgid.c b/sysdeps/unix/sysv/linux/arm/getgid.c deleted file mode 100644 index 0a4d6061f0..0000000000 --- a/sysdeps/unix/sysv/linux/arm/getgid.c +++ /dev/null @@ -1 +0,0 @@ -#include <sysdeps/unix/sysv/linux/i386/getgid.c> diff --git a/sysdeps/unix/sysv/linux/arm/getgroups.c b/sysdeps/unix/sysv/linux/arm/getgroups.c deleted file mode 100644 index 102ea24e14..0000000000 --- a/sysdeps/unix/sysv/linux/arm/getgroups.c +++ /dev/null @@ -1,2 +0,0 @@ -/* We also have to rewrite the kernel gid_t to the user land type. */ -#include <sysdeps/unix/sysv/linux/i386/getgroups.c> diff --git a/sysdeps/unix/sysv/linux/arm/getresgid.c b/sysdeps/unix/sysv/linux/arm/getresgid.c deleted file mode 100644 index b703a414cc..0000000000 --- a/sysdeps/unix/sysv/linux/arm/getresgid.c +++ /dev/null @@ -1 +0,0 @@ -#include <sysdeps/unix/sysv/linux/i386/getresgid.c> diff --git a/sysdeps/unix/sysv/linux/arm/getresuid.c b/sysdeps/unix/sysv/linux/arm/getresuid.c deleted file mode 100644 index 0b14cefe34..0000000000 --- a/sysdeps/unix/sysv/linux/arm/getresuid.c +++ /dev/null @@ -1 +0,0 @@ -#include <sysdeps/unix/sysv/linux/i386/getresuid.c> diff --git a/sysdeps/unix/sysv/linux/arm/getuid.c b/sysdeps/unix/sysv/linux/arm/getuid.c deleted file mode 100644 index d682c79a49..0000000000 --- a/sysdeps/unix/sysv/linux/arm/getuid.c +++ /dev/null @@ -1 +0,0 @@ -#include <sysdeps/unix/sysv/linux/i386/getuid.c> diff --git a/sysdeps/unix/sysv/linux/arm/syscalls.list b/sysdeps/unix/sysv/linux/arm/syscalls.list index f2133bc404..15ad91edb9 100644 --- a/sysdeps/unix/sysv/linux/arm/syscalls.list +++ b/sysdeps/unix/sysv/linux/arm/syscalls.list @@ -4,6 +4,14 @@ chown - chown32 i:sii __chown chown lchown - lchown32 i:sii __lchown lchown fchown - fchown32 i:iii __fchown fchown +getegid - getegid32 Ei: __getegid getegid +geteuid - geteuid32 Ei: __geteuid geteuid +getgid - getgid32 Ei: __getgid getgid +getuid - getuid32 Ei: __getuid getuid +getresgid - getresgid32 i:ppp __getresgid getresgid +getresuid - getresuid32 i:ppp __getresuid getresuid +getgroups - getgroups32 i:ip __getgroups getgroups + prlimit64 EXTRA prlimit64 i:iipp prlimit64 fanotify_mark EXTRA fanotify_mark i:iiiiis fanotify_mark diff --git a/sysdeps/unix/sysv/linux/i386/getegid.c b/sysdeps/unix/sysv/linux/i386/getegid.c deleted file mode 100644 index ec56bfbcf9..0000000000 --- a/sysdeps/unix/sysv/linux/i386/getegid.c +++ /dev/null @@ -1,33 +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> - -/* Consider moving to syscalls.list. */ - -gid_t -__getegid (void) -{ - INTERNAL_SYSCALL_DECL (err); - return INTERNAL_SYSCALL (getegid32, err, 0); -} - -weak_alias (__getegid, getegid) diff --git a/sysdeps/unix/sysv/linux/i386/geteuid.c b/sysdeps/unix/sysv/linux/i386/geteuid.c deleted file mode 100644 index c4e794ab23..0000000000 --- a/sysdeps/unix/sysv/linux/i386/geteuid.c +++ /dev/null @@ -1,33 +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> - -/* Consider moving to syscalls.list. */ - -uid_t -__geteuid (void) -{ - INTERNAL_SYSCALL_DECL (err); - return INTERNAL_SYSCALL (geteuid32, err, 0); -} - -weak_alias (__geteuid, geteuid) diff --git a/sysdeps/unix/sysv/linux/i386/getgid.c b/ |
