Skip to content

Commit af31b04

Browse files
mmizumadjbw
authored andcommitted
tools/testing/nvdimm: Fix the array size for dimm devices.
KASAN reports following global out of bounds access while nfit_test is being loaded. The out of bound access happens the following reference to dimm_fail_cmd_flags[dimm]. 'dimm' is over than the index value, NUM_DCR (==5). static int override_return_code(int dimm, unsigned int func, int rc) { if ((1 << func) & dimm_fail_cmd_flags[dimm]) { dimm_fail_cmd_flags[] definition: static unsigned long dimm_fail_cmd_flags[NUM_DCR]; 'dimm' is the return value of get_dimm(), and get_dimm() returns the index of handle[] array. The handle[] has 7 index. Let's use ARRAY_SIZE(handle) as the array size. KASAN report: ================================================================== BUG: KASAN: global-out-of-bounds in nfit_test_ctl+0x47bb/0x55b0 [nfit_test] Read of size 8 at addr ffffffffc10cbbe8 by task kworker/u41:0/8 ... Call Trace: dump_stack+0xea/0x1b0 ? dump_stack_print_info.cold.0+0x1b/0x1b ? kmsg_dump_rewind_nolock+0xd9/0xd9 print_address_description+0x65/0x22e ? nfit_test_ctl+0x47bb/0x55b0 [nfit_test] kasan_report.cold.6+0x92/0x1a6 nfit_test_ctl+0x47bb/0x55b0 [nfit_test] ... The buggy address belongs to the variable: dimm_fail_cmd_flags+0x28/0xffffffffffffa440 [nfit_test] ================================================================== Fixes: 39611e8 ("tools/testing/nvdimm: Make DSM failure code injection...") Signed-off-by: Masayoshi Mizuma <[email protected]> Signed-off-by: Dan Williams <[email protected]>
1 parent 6510223 commit af31b04

File tree

1 file changed

+4
-4
lines changed
  • tools/testing/nvdimm/test

1 file changed

+4
-4
lines changed

tools/testing/nvdimm/test/nfit.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -140,8 +140,8 @@ static u32 handle[] = {
140140
[6] = NFIT_DIMM_HANDLE(1, 0, 0, 0, 1),
141141
};
142142

143-
static unsigned long dimm_fail_cmd_flags[NUM_DCR];
144-
static int dimm_fail_cmd_code[NUM_DCR];
143+
static unsigned long dimm_fail_cmd_flags[ARRAY_SIZE(handle)];
144+
static int dimm_fail_cmd_code[ARRAY_SIZE(handle)];
145145

146146
static const struct nd_intel_smart smart_def = {
147147
.flags = ND_INTEL_SMART_HEALTH_VALID
@@ -205,7 +205,7 @@ struct nfit_test {
205205
unsigned long deadline;
206206
spinlock_t lock;
207207
} ars_state;
208-
struct device *dimm_dev[NUM_DCR];
208+
struct device *dimm_dev[ARRAY_SIZE(handle)];
209209
struct nd_intel_smart *smart;
210210
struct nd_intel_smart_threshold *smart_threshold;
211211
struct badrange badrange;
@@ -2680,7 +2680,7 @@ static int nfit_test_probe(struct platform_device *pdev)
26802680
u32 nfit_handle = __to_nfit_memdev(nfit_mem)->device_handle;
26812681
int i;
26822682

2683-
for (i = 0; i < NUM_DCR; i++)
2683+
for (i = 0; i < ARRAY_SIZE(handle); i++)
26842684
if (nfit_handle == handle[i])
26852685
dev_set_drvdata(nfit_test->dimm_dev[i],
26862686
nfit_mem);

0 commit comments

Comments
 (0)