Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9fc03876 authored by Toshi Kani's avatar Toshi Kani Committed by Greg Kroah-Hartman
Browse files

acpi, nfit: fix register dimm error handling 



commit 23fbd7c70aec7600e3227eb24259fc55bf6e4881 upstream.

A NULL pointer reference kernel bug was observed when
acpi_nfit_add_dimm() called in acpi_nfit_register_dimms() failed. This
error path does not set nfit_mem->nvdimm, but the 2nd
list_for_each_entry() loop in the function assumes it's always set. Add
a check to nfit_mem->nvdimm.

Fixes: ba9c8dd3 ("acpi, nfit: add dimm device notification support")
Signed-off-by: default avatarToshi Kani <toshi.kani@hpe.com>
Cc: "Rafael J. Wysocki" <rjw@rjwysocki.net>
Signed-off-by: default avatarDan Williams <dan.j.williams@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent f232bfdc

drivers/acpi/nfit/core.c

+3 −0
Original line number Diff line number Diff line
@@ -1618,6 +1618,9 @@ static int acpi_nfit_register_dimms(struct acpi_nfit_desc *acpi_desc) 
		struct kernfs_node *nfit_kernfs;



		nvdimm = nfit_mem->nvdimm;

		if (!nvdimm)

			continue;



		nfit_kernfs = sysfs_get_dirent(nvdimm_kobj(nvdimm)->sd, "nfit");

		if (nfit_kernfs)

			nfit_mem->flags_attr = sysfs_get_dirent(nfit_kernfs,