Update.
* sysdeps/unix/sysv/linux/seteuid.c (seteuid): Use setresuid32 syscall directly if possible. If __ASSUME_SETRESUID_SYSCALL is defined drop compatibility code. * sysdeps/unix/sysv/linux/setegid.c (setegid): Use setresgid32 syscall directly if possible. If __ASSUME_SETRESUID_SYSCALL is defined drop compatibility code. * sysdeps/unix/sysv/linux/i386/seteuid.c (seteuid): Use setresuid32 syscall directly if possible. * sysdeps/unix/sysv/linux/i386/setegid.c (setegid): Use setresgid32 syscall directly if possible.
This commit is contained in:
Ulrich Drepper
parent
f0da6a7d5a
commit
eae59a5681
10
ChangeLog
10
ChangeLog
@ -1,5 +1,15 @@
|
||||
2003-06-08 Ulrich Drepper <drepper@redhat.com>
|
||||
|
||||
* sysdeps/unix/sysv/linux/seteuid.c (seteuid): Use setresuid32
|
||||
syscall directly if possible. If __ASSUME_SETRESUID_SYSCALL is
|
||||
defined drop compatibility code.
|
||||
* sysdeps/unix/sysv/linux/setegid.c (setegid): Use setresgid32
|
||||
syscall directly if possible. If __ASSUME_SETRESUID_SYSCALL is
|
||||
defined drop compatibility code.
|
||||
* sysdeps/unix/sysv/linux/i386/seteuid.c (seteuid): Use
|
||||
setresuid32 syscall directly if possible.
|
||||
* sysdeps/unix/sysv/linux/i386/setegid.c (setegid): Use
|
||||
setresgid32 syscall directly if possible.
|
||||
* sysdeps/unix/sysv/linux/i386/setregid.c (__setregid): Make POSIX
|
||||
compliant. Don't change sgid.
|
||||
* sysdeps/unix/sysv/linux/i386/setreuid.c (__setreuid): Make POSIX
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* Copyright (C) 1995, 96, 97, 98, 2000, 2002 Free Software Foundation, Inc.
|
||||
/* Copyright (C) 1995-1998, 2000, 2002, 2003 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
|
||||
@ -16,13 +16,41 @@
|
||||
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
|
||||
02111-1307 USA. */
|
||||
|
||||
#include <errno.h>
|
||||
#include <unistd.h>
|
||||
#include <sys/types.h>
|
||||
|
||||
#include <sysdep.h>
|
||||
#include "kernel-features.h"
|
||||
|
||||
|
||||
#ifdef __NR_setresgid
|
||||
extern int __setresgid (uid_t rgid, uid_t egid, uid_t sgid);
|
||||
#endif
|
||||
|
||||
int
|
||||
setegid (gid)
|
||||
gid_t gid;
|
||||
{
|
||||
return __setregid (-1, gid);
|
||||
#if __ASSUME_32BITUIDS > 0
|
||||
return INLINE_SYSCALL (setresgid32, 3, -1, gid, -1);
|
||||
#else
|
||||
int result;
|
||||
/* First try the syscall. */
|
||||
# ifdef __NR_setresgid
|
||||
result = __setresgid (-1, gid, -1);
|
||||
# if __ASSUME_SETRESUID_SYSCALL > 0
|
||||
if (0)
|
||||
# else
|
||||
if (result == -1 && errno == ENOSYS)
|
||||
# endif
|
||||
/* No system call available. Use emulation. This may not work
|
||||
since `setregid' also sets the saved user ID when GID is not
|
||||
equal to the real user ID, making it impossible to switch back. */
|
||||
# endif
|
||||
result = __setregid (-1, gid);
|
||||
|
||||
return result;
|
||||
#endif
|
||||
}
|
||||
libc_hidden_def (setegid)
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* Copyright (C) 1998, 2000, 2002 Free Software Foundation, Inc.
|
||||
/* Copyright (C) 1998, 2000, 2002, 2003 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
|
||||
@ -17,10 +17,12 @@
|
||||
02111-1307 USA. */
|
||||
|
||||
#include <errno.h>
|
||||
#include <sys/syscall.h>
|
||||
#include <sys/types.h>
|
||||
#include <unistd.h>
|
||||
|
||||
#include <sysdep.h>
|
||||
#include "kernel-features.h"
|
||||
|
||||
|
||||
#ifdef __NR_setresuid
|
||||
extern int __setresuid (uid_t ruid, uid_t euid, uid_t suid);
|
||||
@ -29,21 +31,25 @@ extern int __setresuid (uid_t ruid, uid_t euid, uid_t suid);
|
||||
int
|
||||
seteuid (uid_t uid)
|
||||
{
|
||||
#if __ASSUME_32BITUIDS > 0
|
||||
return INLINE_SYSCALL (setresuid32, 3, -1, uid, -1);
|
||||
#else
|
||||
int result;
|
||||
/* First try the syscall. */
|
||||
#ifdef __NR_setresuid
|
||||
# ifdef __NR_setresuid
|
||||
result = __setresuid (-1, uid, -1);
|
||||
#if __ASSUME_SETRESUID_SYSCALL > 0
|
||||
# if __ASSUME_SETRESUID_SYSCALL > 0
|
||||
if (0)
|
||||
#else
|
||||
# else
|
||||
if (result == -1 && errno == ENOSYS)
|
||||
#endif
|
||||
# endif
|
||||
/* No system call available. Use emulation. This may not work
|
||||
since `setreuid' also sets the saved user ID when UID is not
|
||||
equal to the real user ID, making it impossible to switch back. */
|
||||
#endif
|
||||
# endif
|
||||
result = __setreuid (-1, uid);
|
||||
|
||||
return result;
|
||||
#endif
|
||||
}
|
||||
libc_hidden_def (seteuid)
|
||||
|
||||
@ -44,7 +44,7 @@ __setregid (gid_t rgid, gid_t egid)
|
||||
#if __ASSUME_32BITUIDS > 0
|
||||
return INLINE_SYSCALL (setresgid32, 3, rgid, egid, -1);
|
||||
#else
|
||||
# ifdef __NR_setregid32
|
||||
# ifdef __NR_setresgid32
|
||||
if (__libc_missing_32bit_uids <= 0)
|
||||
{
|
||||
int result;
|
||||
@ -66,7 +66,13 @@ __setregid (gid_t rgid, gid_t egid)
|
||||
return -1;
|
||||
}
|
||||
|
||||
return INLINE_SYSCALL (setresgid, 3, rgid, egid, -1);
|
||||
# ifdef __NR_setresgid
|
||||
int result = INLINE_SYSCALL (setresgid, 3, rgid, egid, -1);
|
||||
# endif
|
||||
if (result == -1 && errno == ENOSYS)
|
||||
result = INLINE_SYSCALL (setregid, 2, rgid, egid);
|
||||
|
||||
return result;
|
||||
#endif
|
||||
}
|
||||
weak_alias (__setregid, setregid)
|
||||
|
||||
@ -44,7 +44,7 @@ __setreuid (uid_t ruid, uid_t euid)
|
||||
#if __ASSUME_32BITUIDS > 0
|
||||
return INLINE_SYSCALL (setresuid32, 3, ruid, euid, -1);
|
||||
#else
|
||||
# ifdef __NR_setreuid32
|
||||
# ifdef __NR_setresuid32
|
||||
if (__libc_missing_32bit_uids <= 0)
|
||||
{
|
||||
int result;
|
||||
@ -66,7 +66,13 @@ __setreuid (uid_t ruid, uid_t euid)
|
||||
return -1;
|
||||
}
|
||||
|
||||
return INLINE_SYSCALL (setresuid, 3, ruid, euid, -1);
|
||||
# ifdef __NR_setresuid
|
||||
itn result = INLINE_SYSCALL (setresuid, 3, ruid, euid, -1);
|
||||
# endif
|
||||
if (result == -1 && errno == ENOSYS)
|
||||
result = INLINE_SYSCALL (setreuid, 2, ruid, euid);
|
||||
|
||||
return result;
|
||||
#endif
|
||||
}
|
||||
weak_alias (__setreuid, setreuid)
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* Copyright (C) 1998, 2000, 2002 Free Software Foundation, Inc.
|
||||
/* Copyright (C) 1998, 2000, 2002, 2003 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
|
||||
@ -21,7 +21,10 @@
|
||||
#include <sys/types.h>
|
||||
#include <unistd.h>
|
||||
|
||||
#ifdef __NR_setresgid
|
||||
#include <sysdep.h>
|
||||
#include "kernel-features.h"
|
||||
|
||||
#if defined __NR_setresgid || __ASSUME_SETRESUID_SYSCALL > 0
|
||||
|
||||
extern int __setresgid (gid_t rgid, gid_t egid, gid_t sgid);
|
||||
|
||||
@ -36,15 +39,21 @@ setegid (gid_t gid)
|
||||
return -1;
|
||||
}
|
||||
|
||||
# if __ASSUME_32BITUIDS > 0
|
||||
return INLINE_SYSCALL (setresgid32, 3, -1, gid, -1);
|
||||
# else
|
||||
/* First try the syscall. */
|
||||
result = __setresgid (-1, gid, -1);
|
||||
# if __ASSUME_SETRESUID_SYSCALL == 0
|
||||
if (result == -1 && errno == ENOSYS)
|
||||
/* No system call available. Use emulation. This may not work
|
||||
since `setregid' also sets the saved group ID when GID is not
|
||||
equal to the real group ID, making it impossible to switch back. */
|
||||
result = __setregid (-1, gid);
|
||||
# endif
|
||||
|
||||
return result;
|
||||
# endif
|
||||
}
|
||||
libc_hidden_def (setegid)
|
||||
#else
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* Copyright (C) 1998, 1999, 2002 Free Software Foundation, Inc.
|
||||
/* Copyright (C) 1998, 1999, 2002, 2003 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
|
||||
@ -21,6 +21,7 @@
|
||||
#include <sys/types.h>
|
||||
#include <unistd.h>
|
||||
|
||||
#include <sysdep.h>
|
||||
#include "kernel-features.h"
|
||||
|
||||
#if defined __NR_setresuid || __ASSUME_SETRESUID_SYSCALL > 0
|
||||
@ -38,6 +39,9 @@ seteuid (uid_t uid)
|
||||
return -1;
|
||||
}
|
||||
|
||||
# if __ASSUME_32BITUIDS > 0
|
||||
return INLINE_SYSCALL (setresuid32, 3, -1, uid, -1);
|
||||
# else
|
||||
/* First try the syscall. */
|
||||
result = __setresuid (-1, uid, -1);
|
||||
# if __ASSUME_SETRESUID_SYSCALL == 0
|
||||
@ -49,6 +53,7 @@ seteuid (uid_t uid)
|
||||
# endif
|
||||
|
||||
return result;
|
||||
# endif
|
||||
}
|
||||
libc_hidden_def (seteuid)
|
||||
#else
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user