nfit_test: fix buffer overrun, add sanity check (9741a559) · Commits · 戴 / test

It turns out that we were overrunning the 'nfit_buf' buffer in nfit_test0_setup() in the (t->setup_hotplug == 1) case because we failed to correctly account for all of the acpi_nfit_memory_map structures. Fix the structure count which will increase the allocation size of 'nfit_buf' in nfit_test0_alloc(). Also add some WARN_ON()s to nfit_test0_setup() and nfit_test1_setup() to catch future issues where the size of the buffer doesn't match the amount of data we're writing. Signed-off-by:

Ross Zwisler <ross.zwisler@linux.intel.com> Signed-off-by:

Dan Williams <dan.j.williams@intel.com>

tools/testing/nvdimm/test/nfit.c

+8 −1

Original line number	Diff line number	Diff line
		@@ -104,7 +104,8 @@ enum {
		NUM_HINTS = 8,
		NUM_BDW = NUM_DCR,
		NUM_SPA = NUM_PM + NUM_DCR + NUM_BDW,
		NUM_MEM = NUM_DCR + NUM_BDW + 2 /* spa0 iset / + 4 / spa1 iset */,
		NUM_MEM = NUM_DCR + NUM_BDW + 2 /* spa0 iset */
		+ 4 /* spa1 iset / + 1 / spa11 iset */,
		DIMM_SIZE = SZ_32M,
		LABEL_SIZE = SZ_128K,
		SPA_VCD_SIZE = SZ_4M,
		@@ -2047,6 +2048,9 @@ static void nfit_test0_setup(struct nfit_test *t)
		flush->hint_address[i] = t->flush_dma[4]
		+ i * sizeof(u64);
		offset += flush->header.length;

		/* sanity check to make sure we've filled the buffer */
		WARN_ON(offset != t->nfit_size);
		}

		post_ars_status(&t->ars_state, &t->badrange, t->spa_set_dma[0],
		@@ -2165,6 +2169,9 @@ static void nfit_test1_setup(struct nfit_test *t)
		dcr->windows = 0;
		offset += dcr->header.length;

		/* sanity check to make sure we've filled the buffer */
		WARN_ON(offset != t->nfit_size);

		post_ars_status(&t->ars_state, &t->badrange, t->spa_set_dma[0],
		SPA2_SIZE);

Admin message