From: Ira Weiny <ira.weiny@intel.com>
To: wangyingjie55@126.com
Cc: linux-nvdimm@lists.01.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH v1] libnvdimm, dax: Fix a missing check in nd_dax_probe()
Date: Fri, 9 Apr 2021 09:41:45 -0700 [thread overview]
Message-ID: <20210409164145.GQ3014244@iweiny-DESK2.sc.intel.com> (raw)
In-Reply-To: <1617933506-13684-1-git-send-email-wangyingjie55@126.com>
On Thu, Apr 08, 2021 at 06:58:26PM -0700, wangyingjie55@126.com wrote:
> From: Yingjie Wang <wangyingjie55@126.com>
>
> In nd_dax_probe(), 'nd_dax' is allocated by nd_dax_alloc().
> nd_dax_alloc() may fail and return NULL, so we should better check
Avoid the use of 'we'.
> it's return value to avoid a NULL pointer dereference
> a bit later in the code.
How about:
"nd_dax_alloc() may fail and return NULL. Check for NULL before attempting to
use nd_dax to avoid a NULL pointer dereference."
>
> Fixes: c5ed9268643c ("libnvdimm, dax: autodetect support")
> Signed-off-by: Yingjie Wang <wangyingjie55@126.com>
The code looks good though.
Ira
> ---
> drivers/nvdimm/dax_devs.c | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/drivers/nvdimm/dax_devs.c b/drivers/nvdimm/dax_devs.c
> index 99965077bac4..b1426ac03f01 100644
> --- a/drivers/nvdimm/dax_devs.c
> +++ b/drivers/nvdimm/dax_devs.c
> @@ -106,6 +106,8 @@ int nd_dax_probe(struct device *dev, struct nd_namespace_common *ndns)
>
> nvdimm_bus_lock(&ndns->dev);
> nd_dax = nd_dax_alloc(nd_region);
> + if (!nd_dax)
> + return -ENOMEM;
> nd_pfn = &nd_dax->nd_pfn;
> dax_dev = nd_pfn_devinit(nd_pfn, ndns);
> nvdimm_bus_unlock(&ndns->dev);
> --
> 2.7.4
>
_______________________________________________
Linux-nvdimm mailing list -- linux-nvdimm@lists.01.org
To unsubscribe send an email to linux-nvdimm-leave@lists.01.org
WARNING: multiple messages have this Message-ID (diff)
From: Ira Weiny <ira.weiny@intel.com>
To: wangyingjie55@126.com
Cc: dan.j.williams@intel.com, vishal.l.verma@intel.com,
dave.jiang@intel.com, linux-nvdimm@lists.01.org,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH v1] libnvdimm, dax: Fix a missing check in nd_dax_probe()
Date: Fri, 9 Apr 2021 09:41:45 -0700 [thread overview]
Message-ID: <20210409164145.GQ3014244@iweiny-DESK2.sc.intel.com> (raw)
In-Reply-To: <1617933506-13684-1-git-send-email-wangyingjie55@126.com>
On Thu, Apr 08, 2021 at 06:58:26PM -0700, wangyingjie55@126.com wrote:
> From: Yingjie Wang <wangyingjie55@126.com>
>
> In nd_dax_probe(), 'nd_dax' is allocated by nd_dax_alloc().
> nd_dax_alloc() may fail and return NULL, so we should better check
Avoid the use of 'we'.
> it's return value to avoid a NULL pointer dereference
> a bit later in the code.
How about:
"nd_dax_alloc() may fail and return NULL. Check for NULL before attempting to
use nd_dax to avoid a NULL pointer dereference."
>
> Fixes: c5ed9268643c ("libnvdimm, dax: autodetect support")
> Signed-off-by: Yingjie Wang <wangyingjie55@126.com>
The code looks good though.
Ira
> ---
> drivers/nvdimm/dax_devs.c | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/drivers/nvdimm/dax_devs.c b/drivers/nvdimm/dax_devs.c
> index 99965077bac4..b1426ac03f01 100644
> --- a/drivers/nvdimm/dax_devs.c
> +++ b/drivers/nvdimm/dax_devs.c
> @@ -106,6 +106,8 @@ int nd_dax_probe(struct device *dev, struct nd_namespace_common *ndns)
>
> nvdimm_bus_lock(&ndns->dev);
> nd_dax = nd_dax_alloc(nd_region);
> + if (!nd_dax)
> + return -ENOMEM;
> nd_pfn = &nd_dax->nd_pfn;
> dax_dev = nd_pfn_devinit(nd_pfn, ndns);
> nvdimm_bus_unlock(&ndns->dev);
> --
> 2.7.4
>
next prev parent reply other threads:[~2021-04-09 16:41 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-09 1:58 [PATCH v1] libnvdimm, dax: Fix a missing check in nd_dax_probe() wangyingjie55
2021-04-09 1:58 ` wangyingjie55
2021-04-09 16:41 ` Ira Weiny [this message]
2021-04-09 16:41 ` Ira Weiny
-- strict thread matches above, loose matches on Subject: below --
2021-04-10 0:33 wangyingjie55
2021-04-10 0:33 ` wangyingjie55
2021-04-10 4:54 ` Dan Williams
2021-04-10 4:54 ` Dan Williams
2021-03-17 9:36 wangyingjie55
2021-03-17 9:36 ` wangyingjie55
2021-03-17 9:32 wangyingjie55
2021-03-17 9:32 ` wangyingjie55
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210409164145.GQ3014244@iweiny-DESK2.sc.intel.com \
--to=ira.weiny@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-nvdimm@lists.01.org \
--cc=wangyingjie55@126.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.