]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
gpio: pl061: handle failed allocations
authorNicholas Mc Guire <hofrat@osadl.org>
Sat, 1 Dec 2018 11:57:18 +0000 (12:57 +0100)
committerLinus Walleij <linus.walleij@linaro.org>
Thu, 10 Jan 2019 14:54:50 +0000 (15:54 +0100)
devm_kzalloc(), devm_kstrdup() and devm_kasprintf() all can
fail internal allocation and return NULL. Using any of the assigned
objects without checking is not safe. As this is early in the boot
phase and these allocations really should not fail, any failure here
is probably an indication of a more serious issue so it makes little
sense to try and rollback the previous allocated resources or try to
continue;  but rather the probe function is simply exited with -ENOMEM.

Signed-off-by: Nicholas Mc Guire <hofrat@osadl.org>
Fixes: 684284b64aae ("ARM: integrator: add MMCI device to IM-PD1")
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
arch/arm/mach-integrator/impd1.c

index a109f6482413660bf455e9573d8e59d4e7a8a0e7..0f916c245a2e9c75c97f42e3590e21b675f0a614 100644 (file)
@@ -393,7 +393,11 @@ static int __ref impd1_probe(struct lm_device *dev)
                                              sizeof(*lookup) + 3 * sizeof(struct gpiod_lookup),
                                              GFP_KERNEL);
                        chipname = devm_kstrdup(&dev->dev, devname, GFP_KERNEL);
-                       mmciname = kasprintf(GFP_KERNEL, "lm%x:00700", dev->id);
+                       mmciname = devm_kasprintf(&dev->dev, GFP_KERNEL,
+                                                 "lm%x:00700", dev->id);
+                       if (!lookup || !chipname || !mmciname)
+                               return -ENOMEM;
+
                        lookup->dev_id = mmciname;
                        /*
                         * Offsets on GPIO block 1: