* [PATCH][next] iio: st_sensors: handle memory allocation failure to fix null pointer dereference
@ 2020-01-21 16:17 Colin King
2020-01-23 15:28 ` Linus Walleij
0 siblings, 1 reply; 3+ messages in thread
From: Colin King @ 2020-01-21 16:17 UTC (permalink / raw)
To: Jonathan Cameron, Hartmut Knaack, Lars-Peter Clausen,
Peter Meerwald-Stadler, Linus Walleij, linux-iio
Cc: kernel-janitors, linux-kernel
From: Colin Ian King <colin.king@canonical.com>
A null pointer deference on pdata can occur if the allocation of
pdata fails. Fix this by adding a null pointer check and handle
the -ENOMEM failure in the caller.
Addresses-Coverity: ("Dereference null return value")
Fixes: 3ce85cc4fbb7 ("iio: st_sensors: get platform data from device tree")
Signed-off-by: Colin Ian King <colin.king@canonical.com>
---
drivers/iio/common/st_sensors/st_sensors_core.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/drivers/iio/common/st_sensors/st_sensors_core.c b/drivers/iio/common/st_sensors/st_sensors_core.c
index e051edbc43c1..0e35ff06f9af 100644
--- a/drivers/iio/common/st_sensors/st_sensors_core.c
+++ b/drivers/iio/common/st_sensors/st_sensors_core.c
@@ -328,6 +328,8 @@ static struct st_sensors_platform_data *st_sensors_dev_probe(struct device *dev,
return NULL;
pdata = devm_kzalloc(dev, sizeof(*pdata), GFP_KERNEL);
+ if (!pdata)
+ return ERR_PTR(-ENOMEM);
if (!device_property_read_u32(dev, "st,drdy-int-pin", &val) && (val <= 2))
pdata->drdy_int_pin = (u8) val;
else
@@ -371,6 +373,8 @@ int st_sensors_init_sensor(struct iio_dev *indio_dev,
/* If OF/DT pdata exists, it will take precedence of anything else */
of_pdata = st_sensors_dev_probe(indio_dev->dev.parent, pdata);
+ if (IS_ERR(of_pdata))
+ return PTR_ERR(of_pdata);
if (of_pdata)
pdata = of_pdata;
--
2.24.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH][next] iio: st_sensors: handle memory allocation failure to fix null pointer dereference
2020-01-21 16:17 [PATCH][next] iio: st_sensors: handle memory allocation failure to fix null pointer dereference Colin King
@ 2020-01-23 15:28 ` Linus Walleij
2020-02-02 16:25 ` Jonathan Cameron
0 siblings, 1 reply; 3+ messages in thread
From: Linus Walleij @ 2020-01-23 15:28 UTC (permalink / raw)
To: Colin King
Cc: Jonathan Cameron, Hartmut Knaack, Lars-Peter Clausen,
Peter Meerwald-Stadler, linux-iio, kernel-janitors, linux-kernel
On Tue, Jan 21, 2020 at 5:18 PM Colin King <colin.king@canonical.com> wrote:
> From: Colin Ian King <colin.king@canonical.com>
>
> A null pointer deference on pdata can occur if the allocation of
> pdata fails. Fix this by adding a null pointer check and handle
> the -ENOMEM failure in the caller.
>
> Addresses-Coverity: ("Dereference null return value")
That's a weirdo tag, but I suppose you have aligned with the maintainers
about this.
> Fixes: 3ce85cc4fbb7 ("iio: st_sensors: get platform data from device tree")
> Signed-off-by: Colin Ian King <colin.king@canonical.com>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Yours,
Linus Walleij
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH][next] iio: st_sensors: handle memory allocation failure to fix null pointer dereference
2020-01-23 15:28 ` Linus Walleij
@ 2020-02-02 16:25 ` Jonathan Cameron
0 siblings, 0 replies; 3+ messages in thread
From: Jonathan Cameron @ 2020-02-02 16:25 UTC (permalink / raw)
To: Linus Walleij
Cc: Colin King, Hartmut Knaack, Lars-Peter Clausen,
Peter Meerwald-Stadler, linux-iio, kernel-janitors, linux-kernel
On Thu, 23 Jan 2020 16:28:28 +0100
Linus Walleij <linus.walleij@linaro.org> wrote:
> On Tue, Jan 21, 2020 at 5:18 PM Colin King <colin.king@canonical.com> wrote:
>
> > From: Colin Ian King <colin.king@canonical.com>
> >
> > A null pointer deference on pdata can occur if the allocation of
> > pdata fails. Fix this by adding a null pointer check and handle
> > the -ENOMEM failure in the caller.
> >
> > Addresses-Coverity: ("Dereference null return value")
>
> That's a weirdo tag, but I suppose you have aligned with the maintainers
> about this.
>
> > Fixes: 3ce85cc4fbb7 ("iio: st_sensors: get platform data from device tree")
> > Signed-off-by: Colin Ian King <colin.king@canonical.com>
>
> Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Applied to the togreg branch of iio.git and pushed out as testing for
the autobuilders to play with it.
Thanks,
Jonathan
>
> Yours,
> Linus Walleij
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-02-02 16:25 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-01-21 16:17 [PATCH][next] iio: st_sensors: handle memory allocation failure to fix null pointer dereference Colin King
2020-01-23 15:28 ` Linus Walleij
2020-02-02 16:25 ` Jonathan Cameron
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).