[RFC net-next 08/11] firewire net: Fix leakage of kmap for broadcast receive buffer.
From: YOSHIFUJI Hideaki <hidden>
Date: 2013-03-08 01:43:38
Subsystem:
firewire subsystem, the rest · Maintainers:
Takashi Sakamoto, Takashi Sakamoto, Linus Torvalds
Signed-off-by: YOSHIFUJI Hideaki <redacted> --- drivers/firewire/net.c | 7 +++++++ 1 file changed, 7 insertions(+)
diff --git a/drivers/firewire/net.c b/drivers/firewire/net.c
index d8cb6ac..0dc2fdf 100644
--- a/drivers/firewire/net.c
+++ b/drivers/firewire/net.c@@ -1228,6 +1228,8 @@ static int fwnet_broadcast_start(struct fwnet_device *dev) failed_rcv_queue: kfree(dev->broadcast_rcv_buffer_ptrs); dev->broadcast_rcv_buffer_ptrs = NULL; + for (u = 0; u < FWNET_ISO_PAGE_COUNT; u++) + kunmap(dev->broadcast_rcv_buffer.pages[u]); failed_ptrs_alloc: fw_iso_buffer_destroy(&dev->broadcast_rcv_buffer, dev->card); failed_buffer_init:
@@ -1620,10 +1622,15 @@ static int fwnet_remove(struct device *_dev) fwnet_fifo_stop(dev); if (dev->broadcast_rcv_context) { + unsigned u; + fw_iso_context_stop(dev->broadcast_rcv_context); kfree(dev->broadcast_rcv_buffer_ptrs); dev->broadcast_rcv_buffer_ptrs = NULL; + for (u = 0; u < FWNET_ISO_PAGE_COUNT; u++) + kunmap(dev->broadcast_rcv_buffer.pages[u]); + fw_iso_buffer_destroy(&dev->broadcast_rcv_buffer, dev->card); fw_iso_context_destroy(dev->broadcast_rcv_context);
--
1.7.9.5