From 013ac790aa9f6ec83e05806acd3e6b2e56fc9eeb Mon Sep 17 00:00:00 2001
From: "Mark A. Grondona" <mgrondona@llnl.gov>
Date: Thu, 15 Dec 2011 11:19:27 -0800
Subject: [PATCH] env: fix shell function import
src/common/env.c:env_array_user_default() tries to import a "default"
user environment by parsing the output of something like
su - <user> -c "/bin/env" ( or "slurmstepd getenv")
(or an equivalent) when the job is run with --get-user-env. There is some
code that tries to detect and import exported bash shell functions, which
usually have the form
func=() { ...
}
into the job environment. However, one of the many problems with the
code is that the test for bounds overflow:
if ((strlen(value) + strlen(line)) >
(sizeof(value) - 1))
break;
useis sizeof(value) and value is a char *. This means that all multiline
shell functions are truncated, and the following error appears in
users batch script output:
/bin/sh: func: line 1: syntax error: unexpected end of file
/bin/sh: error importing function definition for `func'
This patch fixes the bounds test.
Similar cut-and-paste code in _load_env_cache() was also fixed.
However, it should be noted that there are many other potential cases
where shell functions will not be properly imported by this code.
(For example, quoted unbalanced brackets used in the function)
Someday this should be fixed.
---
src/common/env.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/common/env.c b/src/common/env.c
index 7814062d71a..9ac0061ac2e 100644
--- a/src/common/env.c
+++ b/src/common/env.c
@@ -1627,7 +1627,7 @@ static char **_load_env_cache(const char *username)
break;
_strip_cr_nl(line);
if ((strlen(value) + strlen(line)) >
- (sizeof(value) - 1))
+ (ENV_BUFSIZE - 2))
break;
strcat(value, "\n");
strcat(value, line);
@@ -1859,7 +1859,7 @@ char **env_array_user_default(const char *username, int timeout, int mode)
if (!line)
break;
if ((strlen(value) + strlen(line)) >
- (sizeof(value) - 1))
+ (ENV_BUFSIZE - 2))
break;
strcat(value, "\n");
strcat(value, line);
--
GitLab