From: eric.auger@linaro.org (Eric Auger)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v6 8/8] vfio: platform: reset: calxedaxgmac: fix ioaddr leak
Date: Tue, 3 Nov 2015 18:12:19 +0000 [thread overview]
Message-ID: <1446574339-1843-9-git-send-email-eric.auger@linaro.org> (raw)
In-Reply-To: <1446574339-1843-1-git-send-email-eric.auger@linaro.org>
In the current code the vfio_platform_region is copied on the stack.
As a consequence the ioaddr address is not iounmapped in the vfio
platform driver (vfio_platform_regions_cleanup). The patch uses the
pointer to the region instead.
Signed-off-by: Eric Auger <eric.auger@linaro.org>
---
drivers/vfio/platform/reset/vfio_platform_calxedaxgmac.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/drivers/vfio/platform/reset/vfio_platform_calxedaxgmac.c b/drivers/vfio/platform/reset/vfio_platform_calxedaxgmac.c
index 640f5d8..e3d3d94 100644
--- a/drivers/vfio/platform/reset/vfio_platform_calxedaxgmac.c
+++ b/drivers/vfio/platform/reset/vfio_platform_calxedaxgmac.c
@@ -59,20 +59,20 @@ static inline void xgmac_mac_disable(void __iomem *ioaddr)
int vfio_platform_calxedaxgmac_reset(struct vfio_platform_device *vdev)
{
- struct vfio_platform_region reg = vdev->regions[0];
+ struct vfio_platform_region *reg = &vdev->regions[0];
- if (!reg.ioaddr) {
- reg.ioaddr =
- ioremap_nocache(reg.addr, reg.size);
- if (!reg.ioaddr)
+ if (!reg->ioaddr) {
+ reg->ioaddr =
+ ioremap_nocache(reg->addr, reg->size);
+ if (!reg->ioaddr)
return -ENOMEM;
}
/* disable IRQ */
- writel(0, reg.ioaddr + XGMAC_DMA_INTR_ENA);
+ writel(0, reg->ioaddr + XGMAC_DMA_INTR_ENA);
/* Disable the MAC core */
- xgmac_mac_disable(reg.ioaddr);
+ xgmac_mac_disable(reg->ioaddr);
return 0;
}
--
1.9.1
prev parent reply other threads:[~2015-11-03 18:12 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-11-03 18:12 [PATCH v6 0/8] VFIO platform reset module rework Eric Auger
2015-11-03 18:12 ` [PATCH v6 1/8] vfio: platform: introduce vfio-platform-base module Eric Auger
2015-11-03 18:12 ` [PATCH v6 2/8] vfio: platform: add capability to register a reset function Eric Auger
2015-11-03 18:12 ` [PATCH v6 3/8] vfio: platform: introduce module_vfio_reset_handler macro Eric Auger
2015-11-03 18:12 ` [PATCH v6 4/8] vfio: platform: reset: calxedaxgmac: add reset function registration Eric Auger
2015-11-03 18:12 ` [PATCH v6 5/8] vfio: platform: add compat in vfio_platform_device Eric Auger
2015-11-03 18:12 ` [PATCH v6 6/8] vfio: platform: use list of registered reset function Eric Auger
2015-11-03 18:12 ` [PATCH v6 7/8] vfio: platform: add dev_info on device reset Eric Auger
2015-11-03 18:12 ` Eric Auger [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1446574339-1843-9-git-send-email-eric.auger@linaro.org \
--to=eric.auger@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).