| From 4c63a6d43b0368d98117201c5e54ec2a56b464c3 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Mon, 14 Nov 2022 17:02:40 +0800 |
| Subject: mtd: lpddr2_nvm: Fix possible null-ptr-deref |
| MIME-Version: 1.0 |
| Content-Type: text/plain; charset=UTF-8 |
| Content-Transfer-Encoding: 8bit |
| |
| From: Hui Tang <tanghui20@huawei.com> |
| |
| [ Upstream commit 6bdd45d795adf9e73b38ced5e7f750cd199499ff ] |
| |
| It will cause null-ptr-deref when resource_size(add_range) invoked, |
| if platform_get_resource() returns NULL. |
| |
| Fixes: 96ba9dd65788 ("mtd: lpddr: add driver for LPDDR2-NVM PCM memories") |
| Signed-off-by: Hui Tang <tanghui20@huawei.com> |
| Acked-by: Uwe Kleine-Kรถnig <u.kleine-koenig@pengutronix.de> |
| Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com> |
| Link: https://lore.kernel.org/linux-mtd/20221114090240.244172-1-tanghui20@huawei.com |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/mtd/lpddr/lpddr2_nvm.c | 2 ++ |
| 1 file changed, 2 insertions(+) |
| |
| diff --git a/drivers/mtd/lpddr/lpddr2_nvm.c b/drivers/mtd/lpddr/lpddr2_nvm.c |
| index 5e36366d9b36..19b00225c7ef 100644 |
| --- a/drivers/mtd/lpddr/lpddr2_nvm.c |
| +++ b/drivers/mtd/lpddr/lpddr2_nvm.c |
| @@ -448,6 +448,8 @@ static int lpddr2_nvm_probe(struct platform_device *pdev) |
| |
| /* lpddr2_nvm address range */ |
| add_range = platform_get_resource(pdev, IORESOURCE_MEM, 0); |
| + if (!add_range) |
| + return -ENODEV; |
| |
| /* Populate map_info data structure */ |
| *map = (struct map_info) { |
| -- |
| 2.35.1 |
| |
