nvdimm.lists.linux.dev archive mirror
 help / color / mirror / Atom feed
* Re: [PATCH] acpi, nfit: fix register dimm error handling
  2018-02-02 21:00 [PATCH] acpi, nfit: fix register dimm error handling Toshi Kani
@ 2018-02-02 20:31 ` Dan Williams
  2018-02-02 20:38   ` Kani, Toshi
  0 siblings, 1 reply; 3+ messages in thread
From: Dan Williams @ 2018-02-02 20:31 UTC (permalink / raw)
  To: Toshi Kani
  Cc: Linux ACPI, Rafael J. Wysocki, Linux Kernel Mailing List, linux-nvdimm

On Fri, Feb 2, 2018 at 1:00 PM, Toshi Kani <toshi.kani@hpe.com> wrote:
> 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.
>
> Signed-off-by: Toshi Kani <toshi.kani@hpe.com>
> Cc: Dan Williams <dan.j.williams@intel.com>
> Cc: "Rafael J. Wysocki" <rjw@rjwysocki.net>
> ---
>  drivers/acpi/nfit/core.c |    3 +++
>  1 file changed, 3 insertions(+)
>
> diff --git a/drivers/acpi/nfit/core.c b/drivers/acpi/nfit/core.c
> index abeb4df4f22e..b28ce440a06f 100644
> --- a/drivers/acpi/nfit/core.c
> +++ b/drivers/acpi/nfit/core.c
> @@ -1867,6 +1867,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,

Yes, I assume this also needs:

Cc: <stable@vger.kernel.org>
Fixes: ba9c8dd3c222 ("acpi, nfit: add dimm device notification support")
_______________________________________________
Linux-nvdimm mailing list
Linux-nvdimm@lists.01.org
https://lists.01.org/mailman/listinfo/linux-nvdimm

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH] acpi, nfit: fix register dimm error handling
  2018-02-02 20:31 ` Dan Williams
@ 2018-02-02 20:38   ` Kani, Toshi
  0 siblings, 0 replies; 3+ messages in thread
From: Kani, Toshi @ 2018-02-02 20:38 UTC (permalink / raw)
  To: dan.j.williams; +Cc: linux-acpi, rjw, linux-kernel, linux-nvdimm

On Fri, 2018-02-02 at 12:31 -0800, Dan Williams wrote:
> On Fri, Feb 2, 2018 at 1:00 PM, Toshi Kani <toshi.kani@hpe.com> wrote:
> > 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.
> > 
> > Signed-off-by: Toshi Kani <toshi.kani@hpe.com>
> > Cc: Dan Williams <dan.j.williams@intel.com>
> > Cc: "Rafael J. Wysocki" <rjw@rjwysocki.net>
> > ---
> >  drivers/acpi/nfit/core.c |    3 +++
> >  1 file changed, 3 insertions(+)
> > 
> > diff --git a/drivers/acpi/nfit/core.c b/drivers/acpi/nfit/core.c
> > index abeb4df4f22e..b28ce440a06f 100644
> > --- a/drivers/acpi/nfit/core.c
> > +++ b/drivers/acpi/nfit/core.c
> > @@ -1867,6 +1867,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,
> 
> Yes, I assume this also needs:
> 
> Cc: <stable@vger.kernel.org>
> Fixes: ba9c8dd3c222 ("acpi, nfit: add dimm device notification support")

Right. Thanks!
-Toshi
_______________________________________________
Linux-nvdimm mailing list
Linux-nvdimm@lists.01.org
https://lists.01.org/mailman/listinfo/linux-nvdimm

^ permalink raw reply	[flat|nested] 3+ messages in thread

* [PATCH] acpi, nfit: fix register dimm error handling
@ 2018-02-02 21:00 Toshi Kani
  2018-02-02 20:31 ` Dan Williams
  0 siblings, 1 reply; 3+ messages in thread
From: Toshi Kani @ 2018-02-02 21:00 UTC (permalink / raw)
  To: dan.j.williams; +Cc: linux-acpi, rjw, linux-kernel, linux-nvdimm

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.

Signed-off-by: Toshi Kani <toshi.kani@hpe.com>
Cc: Dan Williams <dan.j.williams@intel.com>
Cc: "Rafael J. Wysocki" <rjw@rjwysocki.net>
---
 drivers/acpi/nfit/core.c |    3 +++
 1 file changed, 3 insertions(+)

diff --git a/drivers/acpi/nfit/core.c b/drivers/acpi/nfit/core.c
index abeb4df4f22e..b28ce440a06f 100644
--- a/drivers/acpi/nfit/core.c
+++ b/drivers/acpi/nfit/core.c
@@ -1867,6 +1867,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,
_______________________________________________
Linux-nvdimm mailing list
Linux-nvdimm@lists.01.org
https://lists.01.org/mailman/listinfo/linux-nvdimm

^ permalink raw reply related	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2018-02-02 20:33 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-02-02 21:00 [PATCH] acpi, nfit: fix register dimm error handling Toshi Kani
2018-02-02 20:31 ` Dan Williams
2018-02-02 20:38   ` Kani, Toshi

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).