Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
Date:   Mon, 7 Oct 2019 07:24:18 -0700
From:   Guenter Roeck <linux@roeck-us.net>
To:     Axel Lin <axel.lin@ingics.com>
Cc:     Mark Brown <broonie@kernel.org>,
        Philippe Schenker <philippe.schenker@toradex.com>,
        Liam Girdwood <lgirdwood@gmail.com>,
        linux-kernel@vger.kernel.org
Subject: Re: [PATCH] regulator: fixed: Prevent NULL pointer dereference when
 !CONFIG_OF
Message-ID: <20191007142418.GA1732@roeck-us.net>
References: <20190922022928.28355-1-axel.lin@ingics.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20190922022928.28355-1-axel.lin@ingics.com>
User-Agent: Mutt/1.9.4 (2018-02-28)
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

On Sun, Sep 22, 2019 at 10:29:28AM +0800, Axel Lin wrote:
> Use of_device_get_match_data which has NULL test for match before
> dereference match->data. Add NULL test for drvtype so it still works
> for fixed_voltage_ops when !CONFIG_OF.
> 
> Signed-off-by: Axel Lin <axel.lin@ingics.com>
> Reviewed-by: Philippe Schenker <philippe.schenker@toradex.com>

Tested-by: Guenter Roeck <linux@roeck-us.net>

> ---
>  drivers/regulator/fixed.c | 5 ++---
>  1 file changed, 2 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/regulator/fixed.c b/drivers/regulator/fixed.c
> index d90a6fd8cbc7..f81533070058 100644
> --- a/drivers/regulator/fixed.c
> +++ b/drivers/regulator/fixed.c
> @@ -144,8 +144,7 @@ static int reg_fixed_voltage_probe(struct platform_device *pdev)
>  	struct device *dev = &pdev->dev;
>  	struct fixed_voltage_config *config;
>  	struct fixed_voltage_data *drvdata;
> -	const struct fixed_dev_type *drvtype =
> -		of_match_device(dev->driver->of_match_table, dev)->data;
> +	const struct fixed_dev_type *drvtype = of_device_get_match_data(dev);
>  	struct regulator_config cfg = { };
>  	enum gpiod_flags gflags;
>  	int ret;
> @@ -177,7 +176,7 @@ static int reg_fixed_voltage_probe(struct platform_device *pdev)
>  	drvdata->desc.type = REGULATOR_VOLTAGE;
>  	drvdata->desc.owner = THIS_MODULE;
>  
> -	if (drvtype->has_enable_clock) {
> +	if (drvtype && drvtype->has_enable_clock) {
>  		drvdata->desc.ops = &fixed_voltage_clkenabled_ops;
>  
>  		drvdata->enable_clock = devm_clk_get(dev, NULL);