autofs-5.1.9 - improve local mount localion path resolution

From: Ian Kent <raven@themaw.net>

In function daemon/spawn.c:do_spawn() there's no need to break up
getting and setting group information. Move this to be with the code
that needs the information so that it can be avoided completely if the
case for which it's needed is not met. Also add more error checking to
the code overall.

Signed-off-by: Ian Kent <raven@themaw.net>
---
 CHANGELOG      |    1 
 daemon/spawn.c |  160 ++++++++++++++++++++++++++++++++++++--------------------
 2 files changed, 103 insertions(+), 58 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index f522b0895..016bb2313 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -94,6 +94,7 @@
 - fix buffer overflow in prepend_opt().
 - fix lookup_hosts module leaks read lock on early return.
 - quiet unset environment variable message on start.
+- improve local mount localion path resolution.
 
 02/11/2023 autofs-5.1.9
 - fix kernel mount status notification.
diff --git a/daemon/spawn.c b/daemon/spawn.c
index a938d44b5..cf0042c71 100644
--- a/daemon/spawn.c
+++ b/daemon/spawn.c
@@ -31,6 +31,7 @@
 #include "automount.h"
 
 static pthread_mutex_t spawn_mutex = PTHREAD_MUTEX_INITIALIZER;
+static pthread_mutex_t getpwuid_mutex = PTHREAD_MUTEX_INITIALIZER;
 
 #define SPAWN_OPT_NONE		0x0000
 #define SPAWN_OPT_LOCK		0x0001
@@ -129,10 +130,6 @@ static int do_spawn(unsigned logopt, unsigned int wait,
 	struct thread_stdenv_vars *tsv;
 	pid_t euid = 0;
 	gid_t egid = 0;
-	gid_t *groups = NULL;
-	gid_t *saved_groups = NULL;
-	int ngroups = 0;
-	int nsaved_groups = 0;
 
 	if (open_pipe(pipefd))
 		return -1;
@@ -156,30 +153,6 @@ static int do_spawn(unsigned logopt, unsigned int wait,
 
 	open_mutex_lock();
 
-	if (euid) {
-		struct passwd *pwd;
-
-		pwd = getpwuid(getuid());
-		if (!pwd)
-			fprintf(stderr,
-				"warning: getpwuid: can't get current username\n");
-		else {
-			/* get number of groups for current gid */
-			getgrouplist(pwd->pw_name, getgid(), NULL, &nsaved_groups);
-			saved_groups = malloc(nsaved_groups * sizeof(gid_t));
-
-			/* get current gid groups list */
-			getgrouplist(pwd->pw_name, getgid(), saved_groups, &nsaved_groups);
-		}
-
-		/* get number of groups of mount triggering process */
-		getgrouplist(tsv->user, egid, NULL, &ngroups);
-		groups = malloc(ngroups * sizeof(gid_t));
-
-		/* get groups list of mount triggering process */
-		getgrouplist(tsv->user, egid, groups, &ngroups);
-	}
-
 	f = fork();
 	if (f == 0) {
 		char **pargv = (char **) argv;
@@ -208,36 +181,113 @@ static int do_spawn(unsigned logopt, unsigned int wait,
 		 * I hope host names are never allowed "/" as first char
 		 */
 		if (use_open && *(argv[loc]) == '/') {
+			struct passwd *pwd;
+			char *pw_name = NULL;
+			gid_t *groups = NULL;
+			gid_t *saved_groups = NULL;
+			int ngroups = 0;
+			int nsaved_groups = 0;
 			char **p;
 			int is_bind, fd;
 
 			pid_t pgrp = getpgrp();
 
+			if (!euid || !tsv->user)
+				goto done;
+
+			status = pthread_mutex_lock(&getpwuid_mutex);
+			if (status)
+				fatal(status);
+
+			pwd = getpwuid(getuid());
+			if (pwd) {
+				int len = strlen(pwd->pw_name);
+
+				pw_name = malloc(len + 1);
+				if (pw_name) {
+					memcpy(pw_name, pwd->pw_name, len);
+					pw_name[len] = 0;
+				}
+			}
+
+			status = pthread_mutex_unlock(&getpwuid_mutex);
+			if (status)
+				fatal(status);
+
+			if (!pw_name) {
+				fprintf(stderr,
+					"warning: getpwuid: can't get current username\n");
+				goto done;
+			}
+
+			/* get number of groups for current gid */
+			if (getgrouplist(pw_name, getgid(), NULL, &nsaved_groups) == -1) {
+				fprintf(stderr,
+					"warning: getgrouplist: failed to get saved groups count\n");
+				free(pw_name);
+				goto done;
+			}
+			saved_groups = malloc(nsaved_groups * sizeof(gid_t));
+			if (!saved_groups) {
+				fprintf(stderr,
+					"warning: malloc: failed to alloc saved groups storage\n");
+				free(pw_name);
+				goto done;
+			}
+
+			/* get current gid groups list */
+			if (getgrouplist(pw_name, getgid(), saved_groups, &nsaved_groups) == -1) {
+				fprintf(stderr,
+					"warning: getgrouplist: failed to get saved groups\n");
+				free(pw_name);
+				free(saved_groups);
+				goto done;
+			}
+			free(pw_name);
+
+			/* get number of groups of mount triggering process */
+			if (getgrouplist(tsv->user, egid, NULL, &ngroups) == -1) {
+				fprintf(stderr,
+					"warning: getgrouplist: failed to get groups count\n");
+				free(saved_groups);
+				goto done;
+			}
+			groups = malloc(ngroups * sizeof(gid_t));
+			if (!groups) {
+				fprintf(stderr,
+					"warning: malloc: failed to alloc groups storage\n");
+				free(saved_groups);
+				goto done;
+			}
+
+			/* get groups list of mount triggering process */
+			if (getgrouplist(tsv->user, egid, groups, &ngroups) == -1) {
+				fprintf(stderr,
+					"warning: getgrouplist: failed to get groups\n");
+				free(saved_groups);
+				free(groups);
+				goto done;
+			}
+
 			/*
 			 * Pretend to be requesting user and set non-autofs
 			 * program group to trigger mount
 			 */
-			if (euid) {
-				if (!tsv->user)
-					fprintf(stderr,
-						"warning: can't init groups\n");
-				else if (groups) {
-					if (setgroups(ngroups, groups) == -1)
-						fprintf(stderr,
-							"warning: setgroups: %s\n",
-							strerror(errno));
-					free(groups);
-				}
-
-				if (setegid(egid) == -1)
-					fprintf(stderr,
-						"warning: setegid: %s\n",
-						strerror(errno));
-				if (seteuid(euid) == -1)
-					fprintf(stderr,
-						"warning: seteuid: %s\n",
-						strerror(errno));
+			if (setgroups(ngroups, groups) == -1) {
+				fprintf(stderr,
+					"warning: setgroups: %s\n", strerror(errno));
+				free(saved_groups);
+				free(groups);
+				goto done;
 			}
+			free(groups);
+
+			if (setegid(egid) == -1)
+				fprintf(stderr,
+					"warning: setegid: %s\n", strerror(errno));
+			if (seteuid(euid) == -1)
+				fprintf(stderr,
+					"warning: seteuid: %s\n", strerror(errno));
 			setpgrp();
 
 			/*
@@ -254,16 +304,15 @@ static int do_spawn(unsigned logopt, unsigned int wait,
 
 			if (seteuid(0) == -1)
 				fprintf(stderr,
-					"warning: seteuid: %s\n",
-					strerror(errno));
+					"warning: seteuid: %s\n", strerror(errno));
 			if (setegid(0) == -1)
 				fprintf(stderr,
-					"warning: setegid: %s\n",
-					strerror(errno));
+					"warning: setegid: %s\n", strerror(errno));
 			if (pgrp >= 0)
 				setpgid(0, pgrp);
+
 			/* Reset groups for trigger of trailing mount */
-			if (euid && saved_groups) {
+			if (saved_groups) {
 				setgroups(nsaved_groups, saved_groups);
 				free(saved_groups);
 			}
@@ -305,11 +354,6 @@ done:
 		pthread_sigmask(SIG_SETMASK, &tmpsig, NULL);
 		open_mutex_unlock();
 
-		if (groups)
-			free(groups);
-		if (saved_groups)
-			free(saved_groups);
-
 		close(pipefd[1]);
 
 		if (f < 0) {
