| From c4eaf8055eaa2c7c1d817e2ef3064ca4caddf7e3 Mon Sep 17 00:00:00 2001 |
| From: Kangjie Lu <kjlu@umn.edu> |
| Date: Sun, 24 Mar 2019 18:10:02 -0500 |
| Subject: gpio: aspeed: fix a potential NULL pointer dereference |
| |
| [ Upstream commit 6cf4511e9729c00a7306cf94085f9cc3c52ee723 ] |
| |
| In case devm_kzalloc, the patch returns ENOMEM to avoid potential |
| NULL pointer dereference. |
| |
| Signed-off-by: Kangjie Lu <kjlu@umn.edu> |
| Reviewed-by: Andrew Jeffery <andrew@aj.id.au> |
| Signed-off-by: Bartosz Golaszewski <bgolaszewski@baylibre.com> |
| Signed-off-by: Sasha Levin (Microsoft) <sashal@kernel.org> |
| --- |
| drivers/gpio/gpio-aspeed.c | 2 ++ |
| 1 file changed, 2 insertions(+) |
| |
| diff --git a/drivers/gpio/gpio-aspeed.c b/drivers/gpio/gpio-aspeed.c |
| index f03fe916eb9d..f6d1bda8a802 100644 |
| --- a/drivers/gpio/gpio-aspeed.c |
| +++ b/drivers/gpio/gpio-aspeed.c |
| @@ -861,6 +861,8 @@ static int __init aspeed_gpio_probe(struct platform_device *pdev) |
| |
| gpio->offset_timer = |
| devm_kzalloc(&pdev->dev, gpio->chip.ngpio, GFP_KERNEL); |
| + if (!gpio->offset_timer) |
| + return -ENOMEM; |
| |
| return aspeed_gpio_setup_irqs(gpio, pdev); |
| } |
| -- |
| 2.19.1 |
| |
