nvdimm: ndtest: Return -ENOMEM if devm_kcalloc() fails in ndtest_probe()

commit a9e6aa994917ee602798bbb03180a194b37865bb upstream.

devm_kcalloc() may fail. ndtest_probe() allocates three DMA address
arrays (dcr_dma, label_dma, dimm_dma) and later unconditionally uses
them in ndtest_nvdimm_init(), which can lead to a NULL pointer
dereference under low-memory conditions.

Check all three allocations and return -ENOMEM if any allocation fails,
jumping to the common error path. Do not emit an extra error message
since the allocator already warns on allocation failure.

Fixes: 9399ab61ad82 ("ndtest: Add dimms to the two buses")
Cc: stable@vger.kernel.org
Signed-off-by: Guangshuo Li <lgs201920130244@gmail.com>
Reviewed-by: Alison Schofield <alison.schofield@intel.com>
Reviewed-by: Ira Weiny <ira.weiny@intel.com>
Reviewed-by: Dave Jiang <dave.jiang@intel.com>
Signed-off-by: Ira Weiny <ira.weiny@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/tools/testing/nvdimm/test/ndtest.c b/tools/testing/nvdimm/test/ndtest.c
index 01ceb98c15a08e5bbc81444897c8cfb761f55ffd..eadc621d4c0353e0d18585349cf7b8cfb074c7d1 100644 (file)
--- a/tools/testing/nvdimm/test/ndtest.c
+++ b/tools/testing/nvdimm/test/ndtest.c
@@ -845,11 +845,22 @@ static int ndtest_probe(struct platform_device *pdev)
 
        p->dcr_dma = devm_kcalloc(&p->pdev.dev, NUM_DCR,
                                 sizeof(dma_addr_t), GFP_KERNEL);
+       if (!p->dcr_dma) {
+               rc = -ENOMEM;
+               goto err;
+       }
        p->label_dma = devm_kcalloc(&p->pdev.dev, NUM_DCR,
                                   sizeof(dma_addr_t), GFP_KERNEL);
+       if (!p->label_dma) {
+               rc = -ENOMEM;
+               goto err;
+       }
        p->dimm_dma = devm_kcalloc(&p->pdev.dev, NUM_DCR,
                                  sizeof(dma_addr_t), GFP_KERNEL);
-
+       if (!p->dimm_dma) {
+               rc = -ENOMEM;
+               goto err;
+       }
        rc = ndtest_nvdimm_init(p);
        if (rc)
                goto err;