autofs-5.1.5 - use malloc(3) in spawn.c

From: Ian Kent <raven@themaw.net>

Use malloc(3) in spawn.c functions instead of alloca(3) as a failure

return for this function is undefined.

Signed-off-by: Ian Kent <raven@themaw.net>

---

 CHANGELOG      |    1 +

 daemon/spawn.c |   50 ++++++++++++++++++++++++++++++++++++++++++++------

 2 files changed, 45 insertions(+), 6 deletions(-)

--- autofs-5.0.7.orig/CHANGELOG

+++ autofs-5.0.7/CHANGELOG

@@ -318,6 +318,7 @@

 - add systemd service command line option.

 - support strictexpire mount option.

 - add NULL check for get_addr_string() return.

+- use malloc(3) in spawn.c.

 25/07/2012 autofs-5.0.7

 =======================

--- autofs-5.0.7.orig/daemon/spawn.c

+++ autofs-5.0.7/daemon/spawn.c

@@ -500,22 +500,33 @@ int spawnv(unsigned logopt, const char *

 int spawnl(unsigned logopt, const char *prog, ...)

 {

 	va_list arg;

-	int argc;

+	int argc, ret;

 	char **argv, **p;

+	unsigned int argv_len;

 	va_start(arg, prog);

 	for (argc = 1; va_arg(arg, char *); argc++);

 	va_end(arg);

-	if (!(argv = alloca(sizeof(char *) * argc)))

+	argv_len = sizeof(char *) * (argc + 1);

+	argv = malloc(argv_len);

+	if (!argv) {

+		char buf[MAX_ERR_BUF];

+		char *estr = strerror_r(errno, buf, sizeof(buf));

+		crit(logopt, "malloc: %s", estr);

 		return -1;

+	}

+	memset(argv, 0, argv_len);

 	va_start(arg, prog);

 	p = argv;

 	while ((*p++ = va_arg(arg, char *)));

 	va_end(arg);

-	return do_spawn(logopt, -1, SPAWN_OPT_NONE, prog, (const char **) argv);

+	ret = do_spawn(logopt, -1, SPAWN_OPT_NONE, prog, (const char **) argv);

+	free(argv);

+

+	return ret;

 }

 int spawn_mount(unsigned logopt, ...)

@@ -533,6 +544,7 @@ int spawn_mount(unsigned logopt, ...)

 	int update_mtab = 1, ret, printed = 0;

 	unsigned int wait = defaults_get_mount_wait();

 	char buf[PATH_MAX + 1];

+	unsigned int argv_len;

 	/* If we use mount locking we can't validate the location */

 #ifdef ENABLE_MOUNT_LOCKING

@@ -558,8 +570,15 @@ int spawn_mount(unsigned logopt, ...)

 	}

 	/* Alloc 1 extra slot in case we need to use the "-f" option */

-	if (!(argv = alloca(sizeof(char *) * (argc + 2))))

+	argv_len = sizeof(char *) * (argc + 2);

+	argv = malloc(argv_len);

+	if (!argv) {

+		char buf[MAX_ERR_BUF];

+		char *estr = strerror_r(errno, buf, sizeof(buf));

+		crit(logopt, "malloc: %s", estr);

 		return -1;

+	}

+	memset(argv, 0, argv_len);

 	argv[0] = arg0;

@@ -634,6 +653,7 @@ int spawn_mount(unsigned logopt, ...)

 		umount(argv[argc]);

 		ret = MNT_FORCE_FAIL;

 	}

+	free(argv);

 	return ret;

 }

@@ -661,6 +681,7 @@ int spawn_bind_mount(unsigned logopt, ..

 	unsigned int retries = MTAB_LOCK_RETRIES;

 	int update_mtab = 1, ret, printed = 0;

 	char buf[PATH_MAX + 1];

+	unsigned int argv_len;

 	/* If we use mount locking we can't validate the location */

 #ifdef ENABLE_MOUNT_LOCKING

@@ -689,8 +710,15 @@ int spawn_bind_mount(unsigned logopt, ..

 		}

 	}

-	if (!(argv = alloca(sizeof(char *) * (argc + 2))))

+	argv_len = sizeof(char *) * (argc + 2);

+	argv = malloc(argv_len);

+	if (!argv) {

+		char buf[MAX_ERR_BUF];

+		char *estr = strerror_r(errno, buf, sizeof(buf));

+		crit(logopt, "malloc: %s", estr);

 		return -1;

+	}

+	memset(argv, 0, argv_len);

 	argv[0] = arg0;

 	argv[1] = bind;

@@ -752,6 +780,7 @@ int spawn_bind_mount(unsigned logopt, ..

 		umount(argv[argc]);

 		ret = MNT_FORCE_FAIL;

 	}

+	free(argv);

 	return ret;

 }

@@ -769,6 +798,7 @@ int spawn_umount(unsigned logopt, ...)

 	int update_mtab = 1, ret, printed = 0;

 	unsigned int wait = defaults_get_umount_wait();

 	char buf[PATH_MAX + 1];

+	unsigned int argv_len;

 #ifdef ENABLE_MOUNT_LOCKING

 	options = SPAWN_OPT_LOCK;

@@ -792,8 +822,15 @@ int spawn_umount(unsigned logopt, ...)

 		}

 	}

-	if (!(argv = alloca(sizeof(char *) * argc + 1)))

+	argv_len = sizeof(char *) * (argc + 1);

+	argv = malloc(argv_len);

+	if (!argv) {

+		char buf[MAX_ERR_BUF];

+		char *estr = strerror_r(errno, buf, sizeof(buf));

+		crit(logopt, "malloc: %s", estr);

 		return -1;

+	}

+	memset(argv, 0, argv_len);

 	argv[0] = arg0;

@@ -841,6 +878,7 @@ int spawn_umount(unsigned logopt, ...)

 		     "and /etc/mtab will differ");

 		ret = 0;

 	}

+	free(argv);

 	return ret;

 }