[uClibc-cvs] uClibc/libc/sysdeps/linux/common setegid.c, 1.4, 1.5 seteuid.c, 1.4, 1.5
Erik Andersen
andersen at uclibc.org
Sun Nov 2 10:03:26 UTC 2003
Update of /var/cvs/uClibc/libc/sysdeps/linux/common
In directory winder:/tmp/cvs-serv10590
Modified Files:
setegid.c seteuid.c
Log Message:
Both setegid and seteuid were implemented suboptimally, such that
we were unable to switch back to the original saved group/user ID.
-Erik
Index: setegid.c
===================================================================
RCS file: /var/cvs/uClibc/libc/sysdeps/linux/common/setegid.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- setegid.c 3 Oct 2001 09:15:04 -0000 1.4
+++ setegid.c 2 Nov 2003 10:03:23 -0000 1.5
@@ -1,8 +1,28 @@
-#include <stdlib.h>
+#define _GNU_SOURCE
#include <unistd.h>
+#include <stdio.h>
+#include <errno.h>
+#include <grp.h>
#include <sys/types.h>
+#include <sys/syscall.h>
int setegid(gid_t gid)
{
- return setregid(-1, gid);
+ int result;
+
+ if (gid == (gid_t) ~0)
+ {
+ __set_errno (EINVAL);
+ return -1;
+ }
+
+#ifdef __NR_setresgid
+ result = setresgid(-1, gid, -1);
+ if (result == -1 && errno == ENOSYS)
+ /* Will also set the saved group ID if egid != gid,
+ * making it impossible to switch back...*/
+#endif
+ result = setregid(-1, gid);
+
+ return result;
}
Index: seteuid.c
===================================================================
RCS file: /var/cvs/uClibc/libc/sysdeps/linux/common/seteuid.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- seteuid.c 27 Sep 2001 05:24:21 -0000 1.4
+++ seteuid.c 2 Nov 2003 10:03:23 -0000 1.5
@@ -1,9 +1,28 @@
+#define _GNU_SOURCE
#include <unistd.h>
#include <stdio.h>
#include <errno.h>
+#include <pwd.h>
#include <sys/types.h>
+#include <sys/syscall.h>
int seteuid(uid_t uid)
{
- return setreuid(-1, uid);
+ int result;
+
+ if (uid == (uid_t) ~0)
+ {
+ __set_errno (EINVAL);
+ return -1;
+ }
+
+#ifdef __NR_setresuid
+ result = setresuid(-1, uid, -1);
+ if (result == -1 && errno == ENOSYS)
+ /* Will also set the saved user ID if euid != uid,
+ * making it impossible to switch back...*/
+#endif
+ result = setreuid(-1, uid);
+
+ return result;
}
More information about the uClibc-cvs
mailing list