* [RFT PATCH] net: axienet: Fix devm_ioremap_resource return value check
@ 2015-07-09 13:21 Krzysztof Kozlowski
2015-07-09 21:03 ` Sören Brinkmann
2015-07-10 4:44 ` David Miller
0 siblings, 2 replies; 3+ messages in thread
From: Krzysztof Kozlowski @ 2015-07-09 13:21 UTC (permalink / raw)
To: Anirudha Sarangi, John Linn, Michal Simek, Sören Brinkmann,
netdev, linux-arm-kernel, linux-kernel
Cc: Krzysztof Kozlowski, stable
Value returned by devm_ioremap_resource() was checked for non-NULL but
devm_ioremap_resource() returns IOMEM_ERR_PTR, not NULL. In case of
error this could lead to dereference of ERR_PTR.
Signed-off-by: Krzysztof Kozlowski <k.kozlowski.k@gmail.com>
Cc: <stable@vger.kernel.org>
Fixes: 46aa27df8853 ("net: axienet: Use devm_* calls")
---
Patch only compile tested.
---
drivers/net/ethernet/xilinx/xilinx_axienet_main.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/net/ethernet/xilinx/xilinx_axienet_main.c b/drivers/net/ethernet/xilinx/xilinx_axienet_main.c
index 4208dd7ef101..d95f9aae95e7 100644
--- a/drivers/net/ethernet/xilinx/xilinx_axienet_main.c
+++ b/drivers/net/ethernet/xilinx/xilinx_axienet_main.c
@@ -1530,9 +1530,9 @@ static int axienet_probe(struct platform_device *pdev)
/* Map device registers */
ethres = platform_get_resource(pdev, IORESOURCE_MEM, 0);
lp->regs = devm_ioremap_resource(&pdev->dev, ethres);
- if (!lp->regs) {
+ if (IS_ERR(lp->regs)) {
dev_err(&pdev->dev, "could not map Axi Ethernet regs.\n");
- ret = -ENOMEM;
+ ret = PTR_ERR(lp->regs);
goto free_netdev;
}
@@ -1599,9 +1599,9 @@ static int axienet_probe(struct platform_device *pdev)
goto free_netdev;
}
lp->dma_regs = devm_ioremap_resource(&pdev->dev, &dmares);
- if (!lp->dma_regs) {
+ if (IS_ERR(lp->dma_regs)) {
dev_err(&pdev->dev, "could not map DMA regs\n");
- ret = -ENOMEM;
+ ret = PTR_ERR(lp->dma_regs);
goto free_netdev;
}
lp->rx_irq = irq_of_parse_and_map(np, 1);
--
2.1.4
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [RFT PATCH] net: axienet: Fix devm_ioremap_resource return value check
2015-07-09 13:21 [RFT PATCH] net: axienet: Fix devm_ioremap_resource return value check Krzysztof Kozlowski
@ 2015-07-09 21:03 ` Sören Brinkmann
2015-07-10 4:44 ` David Miller
1 sibling, 0 replies; 3+ messages in thread
From: Sören Brinkmann @ 2015-07-09 21:03 UTC (permalink / raw)
To: Krzysztof Kozlowski
Cc: Anirudha Sarangi, John Linn, Michal Simek, netdev,
linux-arm-kernel, linux-kernel, stable
On Thu, 2015-07-09 at 10:21PM +0900, Krzysztof Kozlowski wrote:
> Value returned by devm_ioremap_resource() was checked for non-NULL but
> devm_ioremap_resource() returns IOMEM_ERR_PTR, not NULL. In case of
> error this could lead to dereference of ERR_PTR.
>
> Signed-off-by: Krzysztof Kozlowski <k.kozlowski.k@gmail.com>
> Cc: <stable@vger.kernel.org>
> Fixes: 46aa27df8853 ("net: axienet: Use devm_* calls")
Reviewed-by: Sören Brinkmann <soren.brinkmann@xilinx.com>
Sören
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [RFT PATCH] net: axienet: Fix devm_ioremap_resource return value check
2015-07-09 13:21 [RFT PATCH] net: axienet: Fix devm_ioremap_resource return value check Krzysztof Kozlowski
2015-07-09 21:03 ` Sören Brinkmann
@ 2015-07-10 4:44 ` David Miller
1 sibling, 0 replies; 3+ messages in thread
From: David Miller @ 2015-07-10 4:44 UTC (permalink / raw)
To: k.kozlowski.k
Cc: anirudh, John.Linn, michal.simek, soren.brinkmann, netdev,
linux-arm-kernel, linux-kernel, stable
From: Krzysztof Kozlowski <k.kozlowski.k@gmail.com>
Date: Thu, 9 Jul 2015 22:21:20 +0900
> Value returned by devm_ioremap_resource() was checked for non-NULL but
> devm_ioremap_resource() returns IOMEM_ERR_PTR, not NULL. In case of
> error this could lead to dereference of ERR_PTR.
>
> Signed-off-by: Krzysztof Kozlowski <k.kozlowski.k@gmail.com>
> Cc: <stable@vger.kernel.org>
> Fixes: 46aa27df8853 ("net: axienet: Use devm_* calls")
Applied, thanks.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2015-07-10 4:44 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-07-09 13:21 [RFT PATCH] net: axienet: Fix devm_ioremap_resource return value check Krzysztof Kozlowski
2015-07-09 21:03 ` Sören Brinkmann
2015-07-10 4:44 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).