summaryrefslogtreecommitdiffstats
path: root/drivers/mfd
diff options
context:
space:
mode:
authorGustavo A. R. Silva <gustavo@embeddedor.com>2019-01-22 10:56:36 -0600
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-03-23 20:10:09 +0100
commitce02d82c4e1aaf2fd6ef40a43e5e7ace3c817088 (patch)
tree0212e7eecf8e556c40c4a560d21464ab243034aa /drivers/mfd
parent5579d97e92f70d9e728b614e7d7d3cb3afbef245 (diff)
downloadlinux-stable-ce02d82c4e1aaf2fd6ef40a43e5e7ace3c817088.tar.gz
linux-stable-ce02d82c4e1aaf2fd6ef40a43e5e7ace3c817088.tar.bz2
linux-stable-ce02d82c4e1aaf2fd6ef40a43e5e7ace3c817088.zip
mfd: sm501: Fix potential NULL pointer dereference
commit ae7b8eda27b33b1f688dfdebe4d46f690a8f9162 upstream. 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 bug was detected with the help of Coccinelle. Fixes: b2e63555592f ("i2c: gpio: Convert to use descriptors") Cc: stable@vger.kernel.org Signed-off-by: Gustavo A. R. Silva <gustavo@embeddedor.com> Signed-off-by: Lee Jones <lee.jones@linaro.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/mfd')
-rw-r--r--drivers/mfd/sm501.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/mfd/sm501.c b/drivers/mfd/sm501.c
index a530972c5a7e..e0173bf4b0dc 100644
--- a/drivers/mfd/sm501.c
+++ b/drivers/mfd/sm501.c
@@ -1145,6 +1145,9 @@ static int sm501_register_gpio_i2c_instance(struct sm501_devdata *sm,
lookup = devm_kzalloc(&pdev->dev,
sizeof(*lookup) + 3 * sizeof(struct gpiod_lookup),
GFP_KERNEL);
+ if (!lookup)
+ return -ENOMEM;
+
lookup->dev_id = "i2c-gpio";
if (iic->pin_sda < 32)
lookup->table[0].chip_label = "SM501-LOW";