linux-kernel - Re: [PATCH] leds: fix a potential NULL pointer dereference

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <8c616b91-8f0d-f53b-af10-4d768063c5a0@gmail.com>
Date:   Sun, 10 Mar 2019 21:27:46 +0100
From:   Jacek Anaszewski <jacek.anaszewski@...il.com>
To:     Kangjie Lu <kjlu@....edu>
Cc:     pakki001@....edu, Riku Voipio <riku.voipio@....fi>,
        Pavel Machek <pavel@....cz>, linux-leds@...r.kernel.org,
        linux-kernel@...r.kernel.org
Subject: Re: [PATCH] leds: fix a potential NULL pointer dereference

Hi Kangjie,

Thank you for the patch.

On 3/9/19 7:04 AM, Kangjie Lu wrote:
> In case of_match_device cannot find a match, the fixes returns
> -EINVAL to avoid NULL pointer dereference.
> 
> Signed-off-by: Kangjie Lu <kjlu@....edu>
> ---
>   drivers/leds/leds-pca9532.c | 8 ++++++--
>   1 file changed, 6 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/leds/leds-pca9532.c b/drivers/leds/leds-pca9532.c
> index 7fea18b0c15d..4b0335591728 100644
> --- a/drivers/leds/leds-pca9532.c
> +++ b/drivers/leds/leds-pca9532.c
> @@ -513,6 +513,7 @@ static int pca9532_probe(struct i2c_client *client,
>   	const struct i2c_device_id *id)
>   {
>   	int devid;
> +	const struct of_device_id *of_id;
>   	struct pca9532_data *data = i2c_get_clientdata(client);
>   	struct pca9532_platform_data *pca9532_pdata =
>   			dev_get_platdata(&client->dev);
> @@ -528,8 +529,11 @@ static int pca9532_probe(struct i2c_client *client,
>   			dev_err(&client->dev, "no platform data\n");
>   			return -EINVAL;
>   		}
> -		devid = (int)(uintptr_t)of_match_device(
> -			of_pca9532_leds_match, &client->dev)->data;
> +		of_id = of_match_device(of_pca9532_leds_match,
> +				&client->dev);
> +		if (unlikely(!of_id))
> +			return -EINVAL;
> +		devid = (int)of_id->data;
>   	} else {
>   		devid = id->driver_data;
>   	}


Applied to the for-5.2 branch of linux-leds.git.

-- 
Best regards,
Jacek Anaszewski