ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

util/cpuset: fix internal string buffer size

Browse Source 
When all CPUs are set, formatted string overflows str buffer in the
spdk_cpuset structure with '\0'.

It may destroy CPUs bitmap when formatting is used, so additional
integrity checks are performed in UT.

Change-Id: I92ac790b2c215428cbe0ae89ab4b28570ddb9a0d
Signed-off-by: Tomasz Kulasek <tomaszx.kulasek@intel.com>
Reviewed-on: https://review.gerrithub.io/c/440021
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Darek Stojaczyk <dariusz.stojaczyk@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
This commit is contained in:
Tomasz Kulasek 2019-01-08 11:23:01 +01:00 committed by Jim Harris
parent 3d7bf0a6ff
commit 1c2163b944
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/util/cpuset.c
View File

@ -35,7 +35,7 @@
#include "spdk/log.h" #include "spdk/log.h"
struct spdk_cpuset { struct spdk_cpuset {
char str[SPDK_CPUSET_SIZE / 4]; char str[SPDK_CPUSET_SIZE / 4 + 1];
uint8_t cpus[SPDK_CPUSET_SIZE / 8]; uint8_t cpus[SPDK_CPUSET_SIZE / 8];
}; };

14
test/unit/lib/util/cpuset.c/cpuset_ut.c
View File

@ -213,6 +213,8 @@ test_cpuset_fmt(void)
/* Set all cores */ /* Set all cores */
spdk_cpuset_zero(core_mask); spdk_cpuset_zero(core_mask);
CU_ASSERT(cpuset_check_range(core_mask, 0, SPDK_CPUSET_SIZE - 1, false) == 0);
for (lcore = 0; lcore < SPDK_CPUSET_SIZE; lcore++) { for (lcore = 0; lcore < SPDK_CPUSET_SIZE; lcore++) {
spdk_cpuset_set_cpu(core_mask, lcore, true); spdk_cpuset_set_cpu(core_mask, lcore, true);
} }
@ -221,11 +223,15 @@ test_cpuset_fmt(void)
} }
hex_mask_ref[SPDK_CPUSET_SIZE / 4] = '\0'; hex_mask_ref[SPDK_CPUSET_SIZE / 4] = '\0';
/* Check data before format */
CU_ASSERT(cpuset_check_range(core_mask, 0, SPDK_CPUSET_SIZE - 1, true) == 0);
hex_mask = spdk_cpuset_fmt(core_mask); hex_mask = spdk_cpuset_fmt(core_mask);
CU_ASSERT(hex_mask != NULL); SPDK_CU_ASSERT_FATAL(hex_mask != NULL);
if (hex_mask != NULL) { CU_ASSERT(strcmp(hex_mask_ref, hex_mask) == 0);
CU_ASSERT(strcmp(hex_mask_ref, hex_mask) == 0);
} /* Check data integrity after format */
CU_ASSERT(cpuset_check_range(core_mask, 0, SPDK_CPUSET_SIZE - 1, true) == 0);
spdk_cpuset_free(core_mask); spdk_cpuset_free(core_mask);
} }