Commit 193ccca4 authored Jun 30, 2015 by Dan Williams

nfit: fix smatch "use after null check" report



drivers/acpi/nfit.c:1224 acpi_nfit_blk_region_enable()
         error: we previously assumed 'nfit_mem' could be null (see line 1223)

drivers/acpi/nfit.c
  1222          nfit_mem = nvdimm_provider_data(nvdimm);
  1223          if (!nfit_mem || !nfit_mem->dcr || !nfit_mem->bdw) {
                     ^^^^^^^^
Check.

  1224                  dev_dbg(dev, "%s: missing%s%s%s\n", __func__,
  1225                                  nfit_mem ? "" : " nfit_mem",
  1226                                  nfit_mem->dcr ? "" : " dcr",
                                        ^^^^^^^^^^^^^
Unchecked dereference.

Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Acked-by: Ross Zwisler <ross.zwisler@linux.intel.com>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>

parent daa1dee4

drivers/acpi/nfit.c

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -1223,8 +1223,8 @@ static int acpi_nfit_blk_region_enable(struct nvdimm_bus *nvdimm_bus,
	if (!nfit_mem \|\| !nfit_mem->dcr \|\| !nfit_mem->bdw) {		if (!nfit_mem \|\| !nfit_mem->dcr \|\| !nfit_mem->bdw) {
	dev_dbg(dev, "%s: missing%s%s%s\n", __func__,		dev_dbg(dev, "%s: missing%s%s%s\n", __func__,
	nfit_mem ? "" : " nfit_mem",		nfit_mem ? "" : " nfit_mem",
	nfit_mem->dcr ? "" : " dcr",		(nfit_mem && nfit_mem->dcr) ? "" : " dcr",
	nfit_mem->bdw ? "" : " bdw");		(nfit_mem && nfit_mem->bdw) ? "" : " bdw");
	return -ENXIO;		return -ENXIO;
	}		}

Admin message