xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

net: mvpp2: check return value after calling platform_get_resource()

Browse Source 
[ Upstream commit 0bb51a3a385790a4be20085494cf78f70dadf646 ]

It will cause null-ptr-deref if platform_get_resource() returns NULL,
we need check the return value.

Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Yang Yingliang
2021-06-07 22:36:02 +08:00
committed by Greg Kroah-Hartman
parent 49b3a7f38a
commit ce1307ec62
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c
View File

@@ -6871,6 +6871,10 @@ static int mvpp2_probe(struct platform_device *pdev)
return PTR_ERR(priv->lms_base); return PTR_ERR(priv->lms_base);
} else { } else {
res = platform_get_resource(pdev, IORESOURCE_MEM, 1); res = platform_get_resource(pdev, IORESOURCE_MEM, 1);
if (!res) {
dev_err(&pdev->dev, "Invalid resource\n");
return -EINVAL;
}
if (has_acpi_companion(&pdev->dev)) { if (has_acpi_companion(&pdev->dev)) {
/* In case the MDIO memory region is declared in /* In case the MDIO memory region is declared in
* the ACPI, it can already appear as 'in-use' * the ACPI, it can already appear as 'in-use'