Re: [PATCH] net: marvell: fix a missing check of acpi_match_device

[David Miller]

From: Kangjie Lu 
Date: Wed, 26 Dec 2018 00:31:08 -0600

> When acpi_match_device fails, its return value is NULL. Directly using
> the return value without a check may result in a NULL-pointer
> dereference. The fix checks if acpi_match_device fails, and if so,
> returns -EINVAL.
> 
> Signed-off-by: Kangjie Lu 

Applied.

[PATCH] net: marvell: fix a missing check of acpi_match_device

[Kangjie Lu]

When acpi_match_device fails, its return value is NULL. Directly using
the return value without a check may result in a NULL-pointer
dereference. The fix checks if acpi_match_device fails, and if so,
returns -EINVAL.

Signed-off-by: Kangjie Lu 
---
 drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c 
b/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c
index f1dab0b55769..c9444346475b 100644
--- a/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c
+++ b/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c
@@ -5255,6 +5255,8 @@ static int mvpp2_probe(struct platform_device *pdev)
if (has_acpi_companion(>dev)) {
acpi_id = acpi_match_device(pdev->dev.driver->acpi_match_table,
>dev);
+   if (!acpi_id)
+   return -EINVAL;
priv->hw_version = (unsigned long)acpi_id->driver_data;
} else {
priv->hw_version =
-- 
2.17.2 (Apple Git-113)