| Message ID | 84a16ed64a29984b11c34b4f31cdef0758ffbfb2.1546621488.git.gustavo@embeddedor.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Fix NULL pointer dereference and use struct_size | expand |
On Fri, Jan 4, 2019 at 6:18 PM Gustavo A. R. Silva <gustavo@embeddedor.com> wrote: > There is a potential NULL pointer dereference in case devm_kzalloc() > fails and returns NULL. > > Fix this by adding a NULL check on lookup. > > This issue was detected with the help of Coccinelle. > > Fixes: 684284b64aae ("ARM: integrator: add MMCI device to IM-PD1") > Cc: stable@vger.kernel.org > Signed-off-by: Gustavo A. R. Silva <gustavo@embeddedor.com> I already have a patch fixing this from Nicholas Mc Guire, just that I forgot to push it upstream. I'll fix, sorry for not applying his patch earlier. Yours, Linus Walleij
diff --git a/arch/arm/mach-integrator/impd1.c b/arch/arm/mach-integrator/impd1.c index a109f6482413..eb0149561be2 100644 --- a/arch/arm/mach-integrator/impd1.c +++ b/arch/arm/mach-integrator/impd1.c @@ -392,6 +392,9 @@ static int __ref impd1_probe(struct lm_device *dev) lookup = devm_kzalloc(&dev->dev, sizeof(*lookup) + 3 * sizeof(struct gpiod_lookup), GFP_KERNEL); + if (!lookup) + return -ENOMEM; + chipname = devm_kstrdup(&dev->dev, devname, GFP_KERNEL); mmciname = kasprintf(GFP_KERNEL, "lm%x:00700", dev->id); lookup->dev_id = mmciname;
There is a potential NULL pointer dereference in case devm_kzalloc() fails and returns NULL. Fix this by adding a NULL check on lookup. This issue was detected with the help of Coccinelle. Fixes: 684284b64aae ("ARM: integrator: add MMCI device to IM-PD1") Cc: stable@vger.kernel.org Signed-off-by: Gustavo A. R. Silva <gustavo@embeddedor.com> --- arch/arm/mach-integrator/impd1.c | 3 +++ 1 file changed, 3 insertions(+)