mirror of https://github.com/omar-polo/gmid.git
add tests and compat for setresuid and setresgid
This commit is contained in:
parent
06035a0237
commit
bd8683d0fd
|
@ -13,6 +13,8 @@ DISTFILES = Makefile \
|
||||||
reallocarray.c \
|
reallocarray.c \
|
||||||
recallocarray.c \
|
recallocarray.c \
|
||||||
setproctitle.c \
|
setproctitle.c \
|
||||||
|
setresgid.c \
|
||||||
|
setresuid.c \
|
||||||
strlcat.c \
|
strlcat.c \
|
||||||
strlcpy.c \
|
strlcpy.c \
|
||||||
strtonum.c \
|
strtonum.c \
|
||||||
|
|
|
@ -0,0 +1,32 @@
|
||||||
|
/*
|
||||||
|
* Copyright (c) 2004, 2005 Darren Tucker (dtucker at zip com au).
|
||||||
|
*
|
||||||
|
* Permission to use, copy, modify, and distribute this software for any
|
||||||
|
* purpose with or without fee is hereby granted, provided that the above
|
||||||
|
* copyright notice and this permission notice appear in all copies.
|
||||||
|
*
|
||||||
|
* THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
|
||||||
|
* WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
|
||||||
|
* MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
|
||||||
|
* ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
|
||||||
|
* WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
|
||||||
|
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
|
||||||
|
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include <sys/types.h>
|
||||||
|
#include <unistd.h>
|
||||||
|
|
||||||
|
int
|
||||||
|
setresgid(gid_t rgid, gid_t egid, gid_t sgid)
|
||||||
|
{
|
||||||
|
/* this is the only configuration tested */
|
||||||
|
|
||||||
|
if (rgid != egid || egid != sgid)
|
||||||
|
return -1;
|
||||||
|
|
||||||
|
if (setregid(rgid, egid) == -1)
|
||||||
|
return -1;
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
|
@ -0,0 +1,60 @@
|
||||||
|
/*
|
||||||
|
* Copyright (c) 2004, 2005 Darren Tucker (dtucker at zip com au).
|
||||||
|
*
|
||||||
|
* Permission to use, copy, modify, and distribute this software for any
|
||||||
|
* purpose with or without fee is hereby granted, provided that the above
|
||||||
|
* copyright notice and this permission notice appear in all copies.
|
||||||
|
*
|
||||||
|
* THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
|
||||||
|
* WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
|
||||||
|
* MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
|
||||||
|
* ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
|
||||||
|
* WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
|
||||||
|
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
|
||||||
|
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include <sys/types.h>
|
||||||
|
|
||||||
|
#include <errno.h>
|
||||||
|
#include <unistd.h>
|
||||||
|
|
||||||
|
int
|
||||||
|
setresuid(uid_t ruid, uid_t euid, uid_t suid)
|
||||||
|
{
|
||||||
|
uid_t ouid;
|
||||||
|
int ret = -1;
|
||||||
|
|
||||||
|
/* Allow only the tested configuration. */
|
||||||
|
|
||||||
|
if (ruid != euid || euid != suid) {
|
||||||
|
errno = ENOSYS;
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
ouid = getuid();
|
||||||
|
|
||||||
|
if ((ret = setreuid(euid, euid)) == -1)
|
||||||
|
return -1;
|
||||||
|
|
||||||
|
/*
|
||||||
|
* When real, effective and saved uids are the same and we have
|
||||||
|
* changed uids, sanity check that we cannot restore the old uid.
|
||||||
|
*/
|
||||||
|
|
||||||
|
if (ruid == euid && euid == suid && ouid != ruid &&
|
||||||
|
setuid(ouid) != -1 && seteuid(ouid) != -1) {
|
||||||
|
errno = EINVAL;
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Finally, check that the real and effective uids are what we
|
||||||
|
* expect.
|
||||||
|
*/
|
||||||
|
if (getuid() != ruid || geteuid() != euid) {
|
||||||
|
errno = EACCES;
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
return ret;
|
||||||
|
}
|
|
@ -258,6 +258,8 @@ runtest queue_h QUEUE_H || true
|
||||||
runtest reallocarray REALLOCARRAY || true
|
runtest reallocarray REALLOCARRAY || true
|
||||||
runtest recallocarray RECALLOCARRAY || true
|
runtest recallocarray RECALLOCARRAY || true
|
||||||
runtest setproctitle SETPROCTITLE || true
|
runtest setproctitle SETPROCTITLE || true
|
||||||
|
runtest setresgid SETRESGID "" -D_GNU_SOURCE || true
|
||||||
|
runtest setresuid SETRESUID "" -D_GNU_SOURCE || true
|
||||||
runtest strlcat STRLCAT || true
|
runtest strlcat STRLCAT || true
|
||||||
runtest strlcpy STRLCPY || true
|
runtest strlcpy STRLCPY || true
|
||||||
runtest strtonum STRTONUM || true
|
runtest strtonum STRTONUM || true
|
||||||
|
@ -343,6 +345,8 @@ cat <<__HEREDOC__
|
||||||
#define HAVE_REALLOCARRAY ${HAVE_REALLOCARRAY}
|
#define HAVE_REALLOCARRAY ${HAVE_REALLOCARRAY}
|
||||||
#define HAVE_RECALLOCARRAY ${HAVE_RECALLOCARRAY}
|
#define HAVE_RECALLOCARRAY ${HAVE_RECALLOCARRAY}
|
||||||
#define HAVE_SETPROCTITLE ${HAVE_SETPROCTITLE}
|
#define HAVE_SETPROCTITLE ${HAVE_SETPROCTITLE}
|
||||||
|
#define HAVE_SETRESGID ${HAVE_SETRESGID}
|
||||||
|
#define HAVE_SETRESUID ${HAVE_SETRESUID}
|
||||||
#define HAVE_STRLCAT ${HAVE_STRLCAT}
|
#define HAVE_STRLCAT ${HAVE_STRLCAT}
|
||||||
#define HAVE_STRLCPY ${HAVE_STRLCPY}
|
#define HAVE_STRLCPY ${HAVE_STRLCPY}
|
||||||
#define HAVE_STRTONUM ${HAVE_STRTONUM}
|
#define HAVE_STRTONUM ${HAVE_STRTONUM}
|
||||||
|
@ -359,6 +363,9 @@ __HEREDOC__
|
||||||
${HAVE_STRLCPY} -eq 0 -o \
|
${HAVE_STRLCPY} -eq 0 -o \
|
||||||
${HAVE_STRTONUM} -eq 0 ] && echo "#include <stddef.h>"
|
${HAVE_STRTONUM} -eq 0 ] && echo "#include <stddef.h>"
|
||||||
|
|
||||||
|
[ ${HAVE_SETRESGID} -eq 0 -o \
|
||||||
|
${HAVE_SETRESUID} -eq 0 ] && echo "#include <unistd.h>"
|
||||||
|
|
||||||
if [ ${HAVE_ERR} -eq 0 ]; then
|
if [ ${HAVE_ERR} -eq 0 ]; then
|
||||||
echo "extern void err(int, const char*, ...);"
|
echo "extern void err(int, const char*, ...);"
|
||||||
echo "extern void errx(int, const char*, ...);"
|
echo "extern void errx(int, const char*, ...);"
|
||||||
|
@ -407,6 +414,14 @@ if [ ${HAVE_SETPROCTITLE} -eq 0 ]; then
|
||||||
echo "extern void setproctitle(const char *fmt, ...);"
|
echo "extern void setproctitle(const char *fmt, ...);"
|
||||||
COBJS="${COBJS} compat/setproctitle.o"
|
COBJS="${COBJS} compat/setproctitle.o"
|
||||||
fi
|
fi
|
||||||
|
if [ ${HAVE_SETRESGID} -eq 0 ]; then
|
||||||
|
echo "extern int setresgid(gid_t, gid_t, gid_t);"
|
||||||
|
COBJS="${COBJS} compat/setresgid.o"
|
||||||
|
fi
|
||||||
|
if [ ${HAVE_SETRESUID} -eq 0 ]; then
|
||||||
|
echo "extern int setresuid(uid_t, uid_t, uid_t);"
|
||||||
|
COBJS="${COBJS} compat/setresuid.o"
|
||||||
|
fi
|
||||||
if [ ${HAVE_STRLCAT} -eq 0 ]; then
|
if [ ${HAVE_STRLCAT} -eq 0 ]; then
|
||||||
echo "extern size_t strlcat(char*, const char*, size_t);"
|
echo "extern size_t strlcat(char*, const char*, size_t);"
|
||||||
COBJS="${COBJS} compat/strlcat.o"
|
COBJS="${COBJS} compat/strlcat.o"
|
||||||
|
|
|
@ -19,6 +19,8 @@ DISTFILES = Makefile \
|
||||||
reallocarray.c \
|
reallocarray.c \
|
||||||
recallocarray.c \
|
recallocarray.c \
|
||||||
setproctitle.c \
|
setproctitle.c \
|
||||||
|
setresgid.c \
|
||||||
|
setresuid.c \
|
||||||
strlcat.c \
|
strlcat.c \
|
||||||
strlcpy.c \
|
strlcpy.c \
|
||||||
strtonum.c \
|
strtonum.c \
|
||||||
|
|
|
@ -0,0 +1,8 @@
|
||||||
|
#include <sys/types.h>
|
||||||
|
#include <unistd.h>
|
||||||
|
|
||||||
|
int
|
||||||
|
main(void)
|
||||||
|
{
|
||||||
|
return setresgid(-1, -1, -1) == -1;
|
||||||
|
}
|
|
@ -0,0 +1,8 @@
|
||||||
|
#include <sys/types.h>
|
||||||
|
#include <unistd.h>
|
||||||
|
|
||||||
|
int
|
||||||
|
main(void)
|
||||||
|
{
|
||||||
|
return setresuid(-1, -1, -1) == -1;
|
||||||
|
}
|
Loading…
Reference in New Issue