d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

OpenSSH: cherry-pick "need initgroups() before setresgid()"

Browse Source 
From openssh-portable commits f3cbe43e28fe and bf944e3794ef, backported
to OpenSSH 7.9p1 on stable/13.

Reviewed by:	delphij
Security:	CVE-2021-41617
Differential Revision:	https://reviews.freebsd.org/D32460

(cherry picked from commit 172fa4aa75)
This commit is contained in:
Ed Maste 2021-10-11 20:47:39 -04:00
parent e84a97439b
commit be74669a2f
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
crypto/openssh/auth.c
View File

@ -39,6 +39,7 @@ __RCSID("$FreeBSD$");
# include <paths.h>
#endif
#include <pwd.h>
#include <grp.h>
#ifdef HAVE_LOGIN_H
#include <login.h>
#endif
@ -983,6 +984,13 @@ subprocess(const char *tag, struct passwd *pw, const char *command,
}
closefrom(STDERR_FILENO + 1);
if (geteuid() == 0 &&
initgroups(pw->pw_name, pw->pw_gid) == -1) {
error("%s: initgroups(%s, %u): %s", tag,
pw->pw_name, (u_int)pw->pw_gid, strerror(errno));
_exit(1);
}
/* Don't use permanently_set_uid() here to avoid fatal() */
if (setresgid(pw->pw_gid, pw->pw_gid, pw->pw_gid) != 0) {
error("%s: setresgid %u: %s", tag, (u_int)pw->pw_gid,