[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20140211122146.GP32042@lee--X1>
Date: Tue, 11 Feb 2014 12:21:46 +0000
From: Lee Jones <lee.jones@...aro.org>
To: Krzysztof Kozlowski <k.kozlowski@...sung.com>
Cc: Sangbeom Kim <sbkim73@...sung.com>,
Samuel Ortiz <sameo@...ux.intel.com>,
linux-kernel@...r.kernel.org, linux-samsung-soc@...r.kernel.org,
Kyungmin Park <kyungmin.park@...sung.com>,
Marek Szyprowski <m.szyprowski@...sung.com>,
Bartlomiej Zolnierkiewicz <b.zolnierkie@...sung.com>,
stable@...r.kernel.org
Subject: Re: [PATCH 1/7] mfd: 88pm860x: Fix possible NULL pointer dereference
on i2c_new_dummy error
On Tue, 11 Feb 2014, Krzysztof Kozlowski wrote:
> During probe the driver allocates dummy I2C device for companion chip
> with i2c_new_dummy() but it does not check the return value of this call.
>
> In case of error (i2c_new_device(): memory allocation failure or I2C
> address cannot be used) this function returns NULL which is later used
> by regmap_init_i2c().
>
> If i2c_new_dummy() fails for companion device, fail also the probe for
> main MFD driver.
>
> Signed-off-by: Krzysztof Kozlowski <k.kozlowski@...sung.com>
> Cc: stable@...r.kernel.org
> ---
> drivers/mfd/88pm860x-core.c | 5 +++++
> 1 file changed, 5 insertions(+)
>
> diff --git a/drivers/mfd/88pm860x-core.c b/drivers/mfd/88pm860x-core.c
> index c9b1f6422941..e456be9a7c67 100644
> --- a/drivers/mfd/88pm860x-core.c
> +++ b/drivers/mfd/88pm860x-core.c
> @@ -1179,6 +1179,11 @@ static int pm860x_probe(struct i2c_client *client,
> chip->companion_addr = pdata->companion_addr;
> chip->companion = i2c_new_dummy(chip->client->adapter,
> chip->companion_addr);
> + if (!chip->companion) {
> + dev_err(&client->dev,
> + "Failed to allocate I2C companion device\n");
> + return -ENODEV;
> + }
> chip->regmap_companion = regmap_init_i2c(chip->companion,
> &pm860x_regmap_config);
> if (IS_ERR(chip->regmap_companion)) {
Applied, thanks.
--
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists