Make user/group-handling-code more robust
As is there is no security issue, but _if_ we end up with a user or group set to NULL after e.g. ARGEND, we would've hit a null-pointer- dereference of grp in which is now line 311. What we want to check instead is if user or group are NULL respectively and throw an error. Consequently, we can remove the later checks in the drop root section, as we now guarantee that grp and pwd are not NULL. Signed-off-by: Laslo Hunhold <dev@frign.de>
This commit is contained in:
parent
b1dca4cf97
commit
660699492f
1 changed files with 11 additions and 11 deletions
22
main.c
22
main.c
|
@ -271,8 +271,8 @@ main(int argc, char *argv[])
|
||||||
}
|
}
|
||||||
|
|
||||||
if (udsname && (!access(udsname, F_OK) || errno != ENOENT)) {
|
if (udsname && (!access(udsname, F_OK) || errno != ENOENT)) {
|
||||||
die("UNIX-domain socket: %s", errno ?
|
die("UNIX-domain socket '%s': %s", udsname, errno ?
|
||||||
strerror(errno) : "file exists");
|
strerror(errno) : "File exists");
|
||||||
}
|
}
|
||||||
|
|
||||||
/* compile and check the supplied vhost regexes */
|
/* compile and check the supplied vhost regexes */
|
||||||
|
@ -292,14 +292,14 @@ main(int argc, char *argv[])
|
||||||
|
|
||||||
/* validate user and group */
|
/* validate user and group */
|
||||||
errno = 0;
|
errno = 0;
|
||||||
if (user && !(pwd = getpwnam(user))) {
|
if (!user || !(pwd = getpwnam(user))) {
|
||||||
die("getpwnam '%s': %s", user, errno ? strerror(errno) :
|
die("getpwnam '%s': %s", user ? user : "null",
|
||||||
"Entry not found");
|
errno ? strerror(errno) : "Entry not found");
|
||||||
}
|
}
|
||||||
errno = 0;
|
errno = 0;
|
||||||
if (group && !(grp = getgrnam(group))) {
|
if (!group || !(grp = getgrnam(group))) {
|
||||||
die("getgrnam '%s': %s", group, errno ? strerror(errno) :
|
die("getgrnam '%s': %s", group ? group : "null",
|
||||||
"Entry not found");
|
errno ? strerror(errno) : "Entry not found");
|
||||||
}
|
}
|
||||||
|
|
||||||
/* open a new process group */
|
/* open a new process group */
|
||||||
|
@ -337,13 +337,13 @@ main(int argc, char *argv[])
|
||||||
}
|
}
|
||||||
|
|
||||||
/* drop root */
|
/* drop root */
|
||||||
if (grp && setgroups(1, &(grp->gr_gid)) < 0) {
|
if (setgroups(1, &(grp->gr_gid)) < 0) {
|
||||||
die("setgroups:");
|
die("setgroups:");
|
||||||
}
|
}
|
||||||
if (grp && setgid(grp->gr_gid) < 0) {
|
if (setgid(grp->gr_gid) < 0) {
|
||||||
die("setgid:");
|
die("setgid:");
|
||||||
}
|
}
|
||||||
if (pwd && setuid(pwd->pw_uid) < 0) {
|
if (setuid(pwd->pw_uid) < 0) {
|
||||||
die("setuid:");
|
die("setuid:");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue