linux-mmc.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Adrian Hunter <adrian.hunter@intel.com>
To: haibo.chen@nxp.com, ulf.hansson@linaro.org,
	linux-mmc@vger.kernel.org, jh80.chung@samsung.com,
	kgene@kernel.org, krzk@kernel.org, michal.simek@xilinx.com,
	linux-samsung-soc@vger.kernel.org
Cc: linux-imx@nxp.com
Subject: Re: [PATCH] mmc: host: dereference null return value
Date: Wed, 1 Jul 2020 13:33:37 +0300	[thread overview]
Message-ID: <cdc9b395-37ea-8ecd-6e20-1e32f2bd0931@intel.com> (raw)
In-Reply-To: <1592885209-25839-1-git-send-email-haibo.chen@nxp.com>

On 23/06/20 7:06 am, haibo.chen@nxp.com wrote:
> From: Haibo Chen <haibo.chen@nxp.com>
> 
> of_match_node() has the opportunity to return NULL, so need to
> dereference null return value.
> This is reported by Coverity.
> 
> Signed-off-by: Haibo Chen <haibo.chen@nxp.com>
> ---
>  drivers/mmc/host/dw_mmc-exynos.c   | 5 +++--
>  drivers/mmc/host/dw_mmc-k3.c       | 5 +++--
>  drivers/mmc/host/dw_mmc-pltfm.c    | 3 ++-
>  drivers/mmc/host/sdhci-of-arasan.c | 2 ++
>  4 files changed, 10 insertions(+), 5 deletions(-)
> 
> diff --git a/drivers/mmc/host/dw_mmc-exynos.c b/drivers/mmc/host/dw_mmc-exynos.c
> index 5e3d95b63676..27ab55abb03f 100644
> --- a/drivers/mmc/host/dw_mmc-exynos.c
> +++ b/drivers/mmc/host/dw_mmc-exynos.c
> @@ -545,12 +545,13 @@ MODULE_DEVICE_TABLE(of, dw_mci_exynos_match);
>  
>  static int dw_mci_exynos_probe(struct platform_device *pdev)
>  {
> -	const struct dw_mci_drv_data *drv_data;
> +	const struct dw_mci_drv_data *drv_data = NULL;
>  	const struct of_device_id *match;
>  	int ret;
>  
>  	match = of_match_node(dw_mci_exynos_match, pdev->dev.of_node);
> -	drv_data = match->data;
> +	if (match)
> +		drv_data = match->data;

Could be 1 line change:

	drv_data = match ? match->data : NULL;

>  
>  	pm_runtime_get_noresume(&pdev->dev);
>  	pm_runtime_set_active(&pdev->dev);
> diff --git a/drivers/mmc/host/dw_mmc-k3.c b/drivers/mmc/host/dw_mmc-k3.c
> index 50977ff18074..e8a148c306b3 100644
> --- a/drivers/mmc/host/dw_mmc-k3.c
> +++ b/drivers/mmc/host/dw_mmc-k3.c
> @@ -451,11 +451,12 @@ MODULE_DEVICE_TABLE(of, dw_mci_k3_match);
>  
>  static int dw_mci_k3_probe(struct platform_device *pdev)
>  {
> -	const struct dw_mci_drv_data *drv_data;
> +	const struct dw_mci_drv_data *drv_data = NULL;
>  	const struct of_device_id *match;
>  
>  	match = of_match_node(dw_mci_k3_match, pdev->dev.of_node);
> -	drv_data = match->data;
> +	if (match)
> +		drv_data = match->data;

Could be 1 line change:

	drv_data = match ? match->data : NULL;

>  
>  	return dw_mci_pltfm_register(pdev, drv_data);
>  }
> diff --git a/drivers/mmc/host/dw_mmc-pltfm.c b/drivers/mmc/host/dw_mmc-pltfm.c
> index 7de37f524a96..d3dcb96efd13 100644
> --- a/drivers/mmc/host/dw_mmc-pltfm.c
> +++ b/drivers/mmc/host/dw_mmc-pltfm.c
> @@ -78,7 +78,8 @@ static int dw_mci_pltfm_probe(struct platform_device *pdev)
>  
>  	if (pdev->dev.of_node) {
>  		match = of_match_node(dw_mci_pltfm_match, pdev->dev.of_node);
> -		drv_data = match->data;
> +		if (match)
> +			drv_data = match->data;
>  	}
>  
>  	return dw_mci_pltfm_register(pdev, drv_data);
> diff --git a/drivers/mmc/host/sdhci-of-arasan.c b/drivers/mmc/host/sdhci-of-arasan.c
> index fb26e743e1fd..f2090f944a0e 100644
> --- a/drivers/mmc/host/sdhci-of-arasan.c
> +++ b/drivers/mmc/host/sdhci-of-arasan.c
> @@ -1520,6 +1520,8 @@ static int sdhci_arasan_probe(struct platform_device *pdev)
>  	const struct sdhci_arasan_of_data *data;
>  
>  	match = of_match_node(sdhci_arasan_of_match, pdev->dev.of_node);
> +	if (match == NULL)

(!match) seems to be preferred over (match == NULL)

> +		return -ENOPARAM;

ENOPARAM is unconventional here.  ENODEV or EINVAL are better

>  	data = match->data;
>  	host = sdhci_pltfm_init(pdev, data->pdata, sizeof(*sdhci_arasan));
>  
> 


  reply	other threads:[~2020-07-01 10:34 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <CGME20200623041836eucas1p2792e1fe062f8dd59af0ec18b8af1c1ef@eucas1p2.samsung.com>
2020-06-23  4:06 ` [PATCH] mmc: host: dereference null return value haibo.chen
2020-07-01 10:33   ` Adrian Hunter [this message]
2020-07-01 10:57   ` Marek Szyprowski

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=cdc9b395-37ea-8ecd-6e20-1e32f2bd0931@intel.com \
    --to=adrian.hunter@intel.com \
    --cc=haibo.chen@nxp.com \
    --cc=jh80.chung@samsung.com \
    --cc=kgene@kernel.org \
    --cc=krzk@kernel.org \
    --cc=linux-imx@nxp.com \
    --cc=linux-mmc@vger.kernel.org \
    --cc=linux-samsung-soc@vger.kernel.org \
    --cc=michal.simek@xilinx.com \
    --cc=ulf.hansson@linaro.org \
    /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 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).