Skip to content
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

Fix opal arg parsing overhead #11827

Closed
wants to merge 2 commits into from
Closed

Fix opal arg parsing overhead #11827

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
f59bdbe
opal/params: Fix opal_var_dump_color array buffer overflow
Jul 18, 2023
007adc2
opal_var_dump_color_keys: explicitly initialize NULL terminator
ggouaillardet Jul 18, 2023
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
9 changes: 5 additions & 4 deletions opal/runtime/opal_params_core.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@
* Copyright (c) 2010-2014 Los Alamos National Security, LLC.
* All rights reserved.
* Copyright (c) 2014 Hochschule Esslingen. All rights reserved.
* Copyright (c) 2015 Research Organization for Information Science
* Copyright (c) 2015-2023 Research Organization for Information Science
* and Technology (RIST). All rights reserved.
* Copyright (c) 2015 Mellanox Technologies, Inc.
* Copyright (c) 2015-2023 Mellanox Technologies, Inc.
* All rights reserved.
* Copyright (c) 2017 IBM Corporation. All rights reserved.
* Copyright (c) 2018-2022 Amazon.com, Inc. or its affiliates. All Rights reserved.
Expand Down Expand Up @@ -89,10 +89,11 @@ static bool opal_register_util_done = false;

static char *opal_var_dump_color_string = NULL;

static char *opal_var_dump_color_keys[OPAL_VAR_DUMP_COLOR_KEY_COUNT] = {
static char *opal_var_dump_color_keys[OPAL_VAR_DUMP_COLOR_ARR_SIZE] = {
[OPAL_VAR_DUMP_COLOR_VAR_NAME] = "name",
[OPAL_VAR_DUMP_COLOR_VAR_VALUE] = "value",
[OPAL_VAR_DUMP_COLOR_VALID_VALUES] = "valid_values"
[OPAL_VAR_DUMP_COLOR_VALID_VALUES] = "valid_values",
[OPAL_VAR_DUMP_COLOR_KEY_COUNT] = NULL
};

/**
Expand Down
3 changes: 2 additions & 1 deletion opal/runtime/opal_params_core.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* Copyright (c) 2010-2013 Los Alamos National Security, LLC.
* All rights reserved.
* Copyright (c) 2014 Hochschule Esslingen. All rights reserved.
* Copyright (c) 2015 Mellanox Technologies, Inc.
* Copyright (c) 2015-2023 Mellanox Technologies, Inc.
* All rights reserved.
* Copyright (c) 2017 IBM Corporation. All rights reserved.
* Copyright (c) 2022 Advanced Micro Devices, Inc. All rights reserved.
Expand Down Expand Up @@ -46,6 +46,7 @@ typedef enum {
OPAL_VAR_DUMP_COLOR_KEY_COUNT
} opal_var_dump_color_key_t;

#define OPAL_VAR_DUMP_COLOR_ARR_SIZE (OPAL_VAR_DUMP_COLOR_KEY_COUNT + 1)
extern char *opal_var_dump_color[OPAL_VAR_DUMP_COLOR_KEY_COUNT];

# if OPAL_ENABLE_TIMING
Expand Down