linux-kernel - [PATCH -next] reset: mchp: sparx5: fix return value check in mchp_sparx5_map

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-ID: <20210519141638.3052456-1-weiyongjun1@huawei.com>
Date:   Wed, 19 May 2021 14:16:37 +0000
From:   Wei Yongjun <weiyongjun1@...wei.com>
To:     <weiyongjun1@...wei.com>,
        Steen Hegelund <steen.hegelund@...rochip.com>,
        Philipp Zabel <p.zabel@...gutronix.de>,
        Lars Povlsen <lars.povlsen@...rochip.com>,
        Steen Hegelund <Steen.Hegelund@...rochip.com>,
        <UNGLinuxDriver@...rochip.com>
CC:     <linux-arm-kernel@...ts.infradead.org>,
        <linux-kernel@...r.kernel.org>, <kernel-janitors@...r.kernel.org>,
        Hulk Robot <hulkci@...wei.com>
Subject: [PATCH -next] reset: mchp: sparx5: fix return value check in mchp_sparx5_map_io()

In case of error, the function devm_platform_get_and_ioremap_resource()
returns ERR_PTR() and never returns NULL. The NULL test in the return
value check should be replaced with IS_ERR().

Fixes: 453ed4283beb ("reset: mchp: sparx5: add switch reset driver")
Reported-by: Hulk Robot <hulkci@...wei.com>
Signed-off-by: Wei Yongjun <weiyongjun1@...wei.com>
---
 drivers/reset/reset-microchip-sparx5.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/reset/reset-microchip-sparx5.c b/drivers/reset/reset-microchip-sparx5.c
index cff39a643a14..f01e7db8e83b 100644
--- a/drivers/reset/reset-microchip-sparx5.c
+++ b/drivers/reset/reset-microchip-sparx5.c
@@ -82,9 +82,9 @@ static int mchp_sparx5_map_io(struct platform_device *pdev, int index,
 	void __iomem *mem;
 
 	mem = devm_platform_get_and_ioremap_resource(pdev, index, &res);
-	if (!mem) {
+	if (IS_ERR(mem)) {
 		dev_err(&pdev->dev, "Could not map resource %d\n", index);
-		return -ENXIO;
+		return PTR_ERR(mem);
 	}
 	sparx5_reset_regmap_config.name = res->name;
 	map = devm_regmap_init_mmio(&pdev->dev, mem, &sparx5_reset_regmap_config);