Skip to content

OPAL: fix string buffer allocation for large env variables [4.0.x] #8156

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Nov 4, 2020
Merged

OPAL: fix string buffer allocation for large env variables [4.0.x] #8156

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e39d1f3
OPAL: fix string buffer allocation for large env variables
devreal Oct 27, 2020
b5a7ff3
keyval_parse.c: ensure to init values
jsquyres Oct 31, 2020
b6e5192
keyval_parse.c: update whitespace/comments
jsquyres Oct 31, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 31 additions & 8 deletions opal/util/keyval_parse.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@
* All rights reserved.
* Copyright (c) 2015-2016 Los Alamos National Security, LLC. All rights
* reserved.
* Copyright (c) 2018 Triad National Security, LLC. All rights
* reserved.
* Copyright (c) 2020 Cisco Systems, Inc. All rights reserved
* $COPYRIGHT$
*
* Additional copyrights may follow
Expand Down Expand Up @@ -274,33 +277,53 @@ static int save_param_name (void)

static int add_to_env_str(char *var, char *val)
{
int sz, varsz, valsz;
int sz, varsz = 0, valsz = 0, new_envsize;
void *tmp;

if (NULL == var) {
return OPAL_ERR_BAD_PARAM;
}

varsz = strlen(var);
if (NULL != val) {
valsz = strlen(val);
/* If we have a value, it will be preceeded by a '=', so be
sure to account for that */
valsz += 1;
}
sz = 0;
if (NULL != env_str) {
varsz = strlen(var);
valsz = (NULL != val) ? strlen(val) : 0;
sz = strlen(env_str)+varsz+valsz+2;
if (envsize <= sz) {
envsize *=2;
sz = strlen(env_str);
/* If we have a valid variable, the whole clause will be
terminated by a ';', so be sure to account for that */
sz += 1;
}
/* Sum the required new sizes, including space for a terminating
\0 byte */
sz += varsz + valsz + 1;

/* Make sure we have sufficient space */
new_envsize = envsize;
while (new_envsize <= sz) {
new_envsize *= 2;
}

tmp = realloc(env_str, envsize);
if (NULL != env_str) {
if (new_envsize > envsize) {
tmp = realloc(env_str, new_envsize);
if (NULL == tmp) {
return OPAL_ERR_OUT_OF_RESOURCE;
}
env_str = tmp;
}
strcat(env_str, ";");
} else {
env_str = calloc(1, envsize);
env_str = calloc(1, new_envsize);
if (NULL == env_str) {
return OPAL_ERR_OUT_OF_RESOURCE;
}
}
envsize = new_envsize;

strcat(env_str, var);
if (NULL != val) {
Expand Down