Re: [PATCH] Soc: mediatek - Fix possible NULL derefrence.

[Matthias Brugger]

On 27/01/17 12:17, Shailendra Verma wrote:
> of_match_device could return NULL, and so can cause a NULL
> pointer dereference later.
>
> Signed-off-by: Shailendra Verma <shailendra.v@xxxxxxxxxxx>

I fixed the subject line and queued it for v4.12-next/soc
Sorry for the (huge) delay.

Matthias

> ---
>   drivers/soc/mediatek/mtk-pmic-wrap.c |    5 +++++
>   1 file changed, 5 insertions(+)
>
> diff --git a/drivers/soc/mediatek/mtk-pmic-wrap.c b/drivers/soc/mediatek/mtk-pmic-wrap.c
> index a5f1093..c48db98 100644
> --- a/drivers/soc/mediatek/mtk-pmic-wrap.c
> +++ b/drivers/soc/mediatek/mtk-pmic-wrap.c
> @@ -1117,6 +1117,11 @@ static int pwrap_probe(struct platform_device *pdev)
>   	const struct of_device_id *of_slave_id = NULL;
>   	struct resource *res;
>   
> +	if (!of_id) {
> +		dev_err(&pdev->dev, "Error: No device match found\n");
> +		return -ENODEV;
> +	}
> +
>   	if (pdev->dev.of_node->child)
>   		of_slave_id = of_match_node(of_slave_match_tbl,
>   					    pdev->dev.of_node->child);