]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
tools/testing/nvdimm: Use per-DIMM device handle
authorAlison Schofield <alison.schofield@intel.com>
Fri, 31 Oct 2025 23:42:20 +0000 (16:42 -0700)
committerIra Weiny <ira.weiny@intel.com>
Mon, 3 Nov 2025 22:47:13 +0000 (16:47 -0600)
KASAN reports a global-out-of-bounds access when running these nfit
tests: clear.sh, pmem-errors.sh, pfn-meta-errors.sh, btt-errors.sh,
daxdev-errors.sh, and inject-error.sh.

[] BUG: KASAN: global-out-of-bounds in nfit_test_ctl+0x769f/0x7840 [nfit_test]
[] Read of size 4 at addr ffffffffc03ea01c by task ndctl/1215
[] The buggy address belongs to the variable:
[] handle+0x1c/0x1df4 [nfit_test]

nfit_test_search_spa() uses handle[nvdimm->id] to retrieve a device
handle and triggers a KASAN error when it reads past the end of the
handle array. It should not be indexing the handle array at all.

The correct device handle is stored in per-DIMM test data. Each DIMM
has a struct nfit_mem that embeds a struct acpi_nfit_memdev that
describes the NFIT device handle. Use that device handle here.

Fixes: 10246dc84dfc ("acpi nfit: nfit_test supports translate SPA")
Cc: stable@vger.kernel.org
Signed-off-by: Alison Schofield <alison.schofield@intel.com>
Reviewed-by: Dave Jiang <dave.jiang@intel.com>> ---
Link: https://patch.msgid.link/20251031234227.1303113-1-alison.schofield@intel.com
Signed-off-by: Ira Weiny <ira.weiny@intel.com>
tools/testing/nvdimm/test/nfit.c

index cfd4378e2129b2fc6614060e622e79cdaf9b0183..f87e9f251d131025868dc600fd9d45a0c9ac4248 100644 (file)
@@ -670,6 +670,7 @@ static int nfit_test_search_spa(struct nvdimm_bus *bus,
                .addr = spa->spa,
                .region = NULL,
        };
+       struct nfit_mem *nfit_mem;
        u64 dpa;
 
        ret = device_for_each_child(&bus->dev, &ctx,
@@ -687,8 +688,12 @@ static int nfit_test_search_spa(struct nvdimm_bus *bus,
         */
        nd_mapping = &nd_region->mapping[nd_region->ndr_mappings - 1];
        nvdimm = nd_mapping->nvdimm;
+       nfit_mem = nvdimm_provider_data(nvdimm);
+       if (!nfit_mem)
+               return -EINVAL;
 
-       spa->devices[0].nfit_device_handle = handle[nvdimm->id];
+       spa->devices[0].nfit_device_handle =
+               __to_nfit_memdev(nfit_mem)->device_handle;
        spa->num_nvdimms = 1;
        spa->devices[0].dpa = dpa;