Message-ID: <8737vtejg6.wl%kuninori.morimoto.gx@renesas.com>
From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
To: LABBE Corentin <clabbe.montjoie@gmail.com>
CC: <alsa-devel@alsa-project.org>, <broonie@kernel.org>, <lgirdwood@gmail.com>,
        <perex@perex.cz>, <tiwai@suse.com>, <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH] ASoC: rsnd: fix a possible NULL dereference
In-Reply-To: <1448455796-27315-1-git-send-email-clabbe.montjoie@gmail.com>
References: <1448455796-27315-1-git-send-email-clabbe.montjoie@gmail.com>
User-Agent: Wanderlust/2.15.9 Emacs/24.3 Mule/6.0
MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue")
Content-Type: text/plain; charset="US-ASCII"
Date: Wed, 25 Nov 2015 23:46:45 +0000
SpamDiagnosticOutput: 1:23
SpamDiagnosticMetadata: NSPM
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Nov 2015 23:46:45.8750 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SIXPR06MB1022
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
Content-Length: 1463
Lines: 44


Hi LABBE

Thank you for your patch

> of_match_device could return NULL, and so cause a NULL pointer
> dereference later.
> Even if the probability of this case is very low, fixing it made
> static analyzers happy.
> Solving this with of_device_get_match_data made also code simplier.
> 
> Signed-off-by: LABBE Corentin <clabbe.montjoie@gmail.com>
> ---
>  sound/soc/sh/rcar/core.c | 5 +++--
>  1 file changed, 3 insertions(+), 2 deletions(-)
> 
> diff --git a/sound/soc/sh/rcar/core.c b/sound/soc/sh/rcar/core.c
> index deed48e..54cc44c 100644
> --- a/sound/soc/sh/rcar/core.c
> +++ b/sound/soc/sh/rcar/core.c
> @@ -1204,7 +1204,6 @@ static int rsnd_probe(struct platform_device *pdev)
>  	struct rsnd_priv *priv;
>  	struct device *dev = &pdev->dev;
>  	struct rsnd_dai *rdai;
> -	const struct of_device_id *of_id = of_match_device(rsnd_of_match, dev);
>  	const struct rsnd_of_data *of_data;
>  	int (*probe_func[])(struct platform_device *pdev,
>  			    const struct rsnd_of_data *of_data,
> @@ -1221,11 +1220,13 @@ static int rsnd_probe(struct platform_device *pdev)
>  	};
>  	int ret, i;
>  
> +	of_data = of_device_get_match_data(dev);
> +	if (!of_data)
> +		return 1;

return 1 ?
You want to use -EINVAL ?

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/