Skip to content

DAOS-18527 cart: Handling of string env limits (#17466) #17539

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

Draft
frostedcmos wants to merge 2 commits into
base: release/2.6
Choose a base branch
from
Draft

DAOS-18527 cart: Handling of string env limits (#17466) #17539

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0b12cca
DAOS-18527 cart: Handling of string env limits (#17466)
frostedcmos Feb 3, 2026
9b689a9
Merge branch 'release/2.6' into frostedcmos/daos-18527-2.6
frostedcmos Feb 10, 2026
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
48 changes: 37 additions & 11 deletions src/cart/crt_init.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
/*
* (C) Copyright 2016-2024 Intel Corporation.
* (C) Copyright 2025 Hewlett Packard Enterprise Development LP
* (C) Copyright 2025 Google LLC
* (C) Copyright 2025-2026 Hewlett Packard Enterprise Development LP
*
* SPDX-License-Identifier: BSD-2-Clause-Patent
*/
Expand Down Expand Up @@ -269,6 +270,9 @@ static int data_init(int server, crt_init_options_t *opt)

crt_env_dump();

if (!crt_env_list_valid())
return -DER_INVAL;

/* Set context post init / post incr to tune number of pre-posted recvs */
crt_env_get(D_POST_INIT, &post_init);
crt_gdata.cg_post_init = post_init;
Expand Down Expand Up @@ -458,7 +462,7 @@ __split_arg(char *s_arg_to_split, const char *delim, char **first_arg, char **se
return DER_SUCCESS;
}

D_STRNDUP(arg_to_split, s_arg_to_split, 255);
D_STRNDUP(arg_to_split, s_arg_to_split, CRT_ENV_STR_MAX_SIZE);
if (!arg_to_split) {
*first_arg = NULL;
*second_arg = NULL;
Expand Down Expand Up @@ -812,25 +816,25 @@ crt_init_opt(crt_group_id_t grpid, uint32_t flags, crt_init_options_t *opt)
* and processed in crt_na_config_init().
*/
if (interface) {
D_STRNDUP(iface0, interface, 255);
D_STRNDUP(iface0, interface, CRT_ENV_STR_MAX_SIZE);
if (!iface0)
D_GOTO(unlock, rc = -DER_NOMEM);
}

if (domain) {
D_STRNDUP(domain0, domain, 255);
D_STRNDUP(domain0, domain, CRT_ENV_STR_MAX_SIZE);
if (!domain0)
D_GOTO(unlock, rc = -DER_NOMEM);
}

if (port) {
D_STRNDUP(port0, port, 255);
D_STRNDUP(port0, port, CRT_ENV_STR_MAX_SIZE);
if (!port0)
D_GOTO(unlock, rc = -DER_NOMEM);
}

if (auth_key) {
D_STRNDUP(auth_key0, auth_key, 255);
D_STRNDUP(auth_key0, auth_key, CRT_ENV_STR_MAX_SIZE);
if (!auth_key0)
D_GOTO(unlock, rc = -DER_NOMEM);
}
Expand Down Expand Up @@ -1213,24 +1217,34 @@ crt_na_config_init(bool primary, crt_provider_t provider,
}

if (interface) {
D_STRNDUP(na_cfg->noc_interface, interface, 64);
D_STRNDUP(na_cfg->noc_interface, interface, CRT_ENV_STR_MAX_SIZE);
if (!na_cfg->noc_interface)
D_GOTO(out, rc = -DER_NOMEM);
}

if (domain) {
D_STRNDUP(na_cfg->noc_domain, domain, 64);
D_STRNDUP(na_cfg->noc_domain, domain, CRT_ENV_STR_MAX_SIZE);
if (!na_cfg->noc_domain)
D_GOTO(out, rc = -DER_NOMEM);
}

if (auth_key) {
D_STRNDUP(na_cfg->noc_auth_key, auth_key, 255);
D_STRNDUP(na_cfg->noc_auth_key, auth_key, CRT_ENV_STR_MAX_SIZE);
if (!na_cfg->noc_auth_key)
D_GOTO(out, rc = -DER_NOMEM);
}

if (na_cfg->noc_interface) {
/*
* env checks limit strings to CRT_ENV_STR_MAX_SIZE, but an interface can
* be passed as an init argument
*/
if (strlen(na_cfg->noc_interface) + 1 >= CRT_ENV_STR_MAX_SIZE) {
D_ERROR("Interface value '%s' exceeds limit of %d characters\n",
na_cfg->noc_interface, CRT_ENV_STR_MAX_SIZE);
D_GOTO(out, rc = -DER_INVAL);
}

/* count number of ','-separated interfaces */
count = 1;
save_ptr = na_cfg->noc_interface;
Expand All @@ -1256,6 +1270,7 @@ crt_na_config_init(bool primary, crt_provider_t provider,
idx = 0;
token = strtok_r(na_cfg->noc_interface, ",", &save_ptr);
while (token != NULL) {
/* TODO: If needed add filtering for duplicate interfaces here */
na_cfg->noc_iface_str[idx] = token;
token = strtok_r(NULL, ",", &save_ptr);
idx++;
Expand All @@ -1267,6 +1282,16 @@ crt_na_config_init(bool primary, crt_provider_t provider,

count = 0;
if (na_cfg->noc_domain) {
/*
* env checks limit strings to CRT_ENV_STR_MAX_SIZE, but a domain can
* be passed as an init argument
*/
if (strlen(na_cfg->noc_domain) + 1 >= CRT_ENV_STR_MAX_SIZE) {
D_ERROR("Domain value '%s' exceeds limit of %d characters\n",
na_cfg->noc_domain, CRT_ENV_STR_MAX_SIZE);
D_GOTO(out, rc = -DER_INVAL);
}

/* count number of ','-separated domains */
count = 1;
save_ptr = na_cfg->noc_domain;
Expand Down Expand Up @@ -1296,8 +1321,9 @@ crt_na_config_init(bool primary, crt_provider_t provider,
na_cfg->noc_domain_total = count;

if (na_cfg->noc_domain_total > 0 && na_cfg->noc_domain_total != na_cfg->noc_iface_total) {
D_ERROR("Mismatched number of domains (%d) and interfaces (%d) specified\n",
na_cfg->noc_domain_total, na_cfg->noc_iface_total);
D_ERROR("Mismatched # of domains [%d]='%s' and interfaces [%d]='%s' specified\n",
na_cfg->noc_domain_total, na_cfg->noc_domain, na_cfg->noc_iface_total,
na_cfg->noc_interface);
D_GOTO(out, rc = -DER_INVAL);
}

Expand Down
50 changes: 43 additions & 7 deletions src/cart/crt_internal_types.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* (C) Copyright 2016-2024 Intel Corporation.
* (C) Copyright 2025 Google LLC
* (C) Copyright 2025 Hewlett Packard Enterprise Development LP
* (C) Copyright 2025-2026 Hewlett Packard Enterprise Development LP
*
* SPDX-License-Identifier: BSD-2-Clause-Patent
*/
Expand Down Expand Up @@ -191,6 +191,8 @@ struct crt_event_cb_priv {
#define CRT_CALLBACKS_NUM (4) /* start number of CBs */
#endif

#define CRT_ENV_STR_MAX_SIZE 1024

/*
* List of environment variables to read at CaRT library load time.
* for integer envs use ENV()
Expand Down Expand Up @@ -249,13 +251,13 @@ struct crt_event_cb_priv {
#define ENV(x) \
unsigned int _##x; \
int _rc_##x; \
int _no_print_##x;
bool _no_print_##x;

/* char* env */
#define ENV_STR(x) \
char *_##x; \
int _rc_##x; \
int _no_print_##x;
bool _no_print_##x;

#define ENV_STR_NO_PRINT(x) ENV_STR(x)

Expand All @@ -273,6 +275,7 @@ extern struct crt_envs crt_genvs;
static inline void
crt_env_fini(void);

/* init cart env structure */
static inline void
crt_env_init(void)
{
Expand All @@ -283,19 +286,19 @@ crt_env_init(void)
#define ENV(x) \
do { \
crt_genvs._rc_##x = d_getenv_uint(#x, &crt_genvs._##x); \
crt_genvs._no_print_##x = 0; \
crt_genvs._no_print_##x = false; \
} while (0);

#define ENV_STR(x) \
do { \
crt_genvs._rc_##x = d_agetenv_str(&crt_genvs._##x, #x); \
crt_genvs._no_print_##x = 0; \
crt_genvs._no_print_##x = false; \
} while (0);

#define ENV_STR_NO_PRINT(x) \
do { \
crt_genvs._rc_##x = d_agetenv_str(&crt_genvs._##x, #x); \
crt_genvs._no_print_##x = 1; \
crt_genvs._no_print_##x = true; \
} while (0);

CRT_ENV_LIST;
Expand All @@ -306,6 +309,7 @@ crt_env_init(void)
crt_genvs.inited = true;
}

/* fini cart envs */
static inline void
crt_env_fini(void)
{
Expand All @@ -322,14 +326,46 @@ crt_env_fini(void)
crt_genvs.inited = false;
}

/* Returns value if env was present at load time */
/* Returns value if env was present at load time and is part of CRT_ENV_LIST */
#define crt_env_get(name, val) \
do { \
D_ASSERT(crt_genvs.inited); \
if (crt_genvs._rc_##name == 0) \
*val = crt_genvs._##name; \
} while (0)

/* Check envs that contain strings to not exceed CRT_ENV_STR_MAX_SIZE */
static inline bool
crt_env_list_valid(void)
{
/* Ignore non-string envs in this check */
#define ENV(x)

/* if string env exceeds CRT_ENV_STR_MAX_SIZE - return false */
#define ENV_STR(x) \
if (crt_genvs._rc_##x == 0 && strlen(crt_genvs._##x) + 1 > CRT_ENV_STR_MAX_SIZE) { \
D_ERROR("env '%s' (value='%s') exceeded max size %d\n", #x, crt_genvs._##x, \
CRT_ENV_STR_MAX_SIZE); \
return false; \
}

/* if string env exceeds CRT_ENV_STR_MAX_SIZE - return false */
#define ENV_STR_NO_PRINT(x) \
if (crt_genvs._rc_##x == 0 && strlen(crt_genvs._##x) + 1 > CRT_ENV_STR_MAX_SIZE) { \
D_ERROR("env '%s' exceeded max size %d\n", #x, CRT_ENV_STR_MAX_SIZE); \
return false; \
}

/* expand env list using the above ENV_* definitions */
CRT_ENV_LIST;
return true;

#undef ENV
#undef ENV_STR
#undef ENV_STR_NO_PRINT
}

/* dump environment variables from the CRT_ENV_LIST */
static inline void
crt_env_dump(void)
{
Expand Down
Loading