Skip to content

v3.1.x: opal_hwloc_base_cset2str() off-by-1 in its strncat() #6488

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 1 commit into from
Mar 18, 2019
Merged

v3.1.x: opal_hwloc_base_cset2str() off-by-1 in its strncat() #6488

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 9 additions & 7 deletions opal/mca/hwloc/base/hwloc_base_util.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@
* and Technology (RIST). All rights reserved.
* Copyright (C) 2018 Mellanox Technologies, Ltd.
* All rights reserved.
* Copyright (c) 2018 Amazon.com, Inc. or its affiliates. All Rights reserved.
* Copyright (c) 2019 IBM Corporation. All rights reserved.
* $COPYRIGHT$
*
* Additional copyrights may follow
Expand Down Expand Up @@ -1920,14 +1922,14 @@ int opal_hwloc_base_cset2str(char *str, int len,
for (core_index = 0; core_index < num_cores; ++core_index) {
if (map[socket_index][core_index] > 0) {
if (!first) {
strncat(str, ", ", len - strlen(str));
strncat(str, ", ", len - strlen(str) - 1);
}
first = false;

snprintf(tmp, stmp, "socket %d[core %d[hwt %s]]",
socket_index, core_index,
bitmap2rangestr(map[socket_index][core_index]));
strncat(str, tmp, len - strlen(str));
strncat(str, tmp, len - strlen(str) - 1);
}
}
}
Expand Down Expand Up @@ -1983,7 +1985,7 @@ int opal_hwloc_base_cset2mapstr(char *str, int len,
for (socket = hwloc_get_obj_by_type(topo, HWLOC_OBJ_SOCKET, 0);
NULL != socket;
socket = socket->next_cousin) {
strncat(str, "[", len - strlen(str));
strncat(str, "[", len - strlen(str) - 1);

/* Iterate over all existing cores in this socket */
core_index = 0;
Expand All @@ -1995,7 +1997,7 @@ int opal_hwloc_base_cset2mapstr(char *str, int len,
socket->cpuset,
HWLOC_OBJ_CORE, ++core_index)) {
if (core_index > 0) {
strncat(str, "/", len - strlen(str));
strncat(str, "/", len - strlen(str) - 1);
}

/* Iterate over all existing PUs in this core */
Expand All @@ -2010,13 +2012,13 @@ int opal_hwloc_base_cset2mapstr(char *str, int len,

/* Is this PU in the cpuset? */
if (hwloc_bitmap_isset(cpuset, pu->os_index)) {
strncat(str, "B", len - strlen(str));
strncat(str, "B", len - strlen(str) - 1);
} else {
strncat(str, ".", len - strlen(str));
strncat(str, ".", len - strlen(str) - 1);
}
}
}
strncat(str, "]", len - strlen(str));
strncat(str, "]", len - strlen(str) - 1);
}

return OPAL_SUCCESS;
Expand Down