From: Valentin Vidic <vvidic@valentin-vidic.from.hr>
To: Willem de Bruijn <willemdebruijn.kernel@gmail.com>
Cc: "David S. Miller" <davem@davemloft.net>,
Philip Rischel <rischelp@idt.com>,
Florian Fainelli <florian@openwrt.org>,
Roman Yeryomin <roman@advem.lv>, Jakub Kicinski <kuba@kernel.org>,
Andrew Morton <akpm@linux-foundation.org>,
Mike Rapoport <rppt@kernel.org>,
Martin Habets <mhabets@solarflare.com>,
"Michael S. Tsirkin" <mst@redhat.com>,
Network Development <netdev@vger.kernel.org>,
linux-kernel <linux-kernel@vger.kernel.org>,
Valentin Vidic <vvidic@valentin-vidic.from.hr>
Subject: [PATCH v2] net: korina: fix kfree of rx/tx descriptor array
Date: Mon, 12 Oct 2020 00:03:29 +0200 [thread overview]
Message-ID: <20201011220329.13038-1-vvidic@valentin-vidic.from.hr> (raw)
In-Reply-To: <20201011212135.GD8773@valentin-vidic.from.hr>
kmalloc returns KSEG0 addresses so convert back from KSEG1
in kfree. Also make sure array is freed when the driver is
unloaded from the kernel.
Fixes: ef11291bcd5f ("Add support the Korina (IDT RC32434) Ethernet MAC")
Signed-off-by: Valentin Vidic <vvidic@valentin-vidic.from.hr>
---
v2: convert kfree address back to KSEG0
drivers/net/ethernet/korina.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/korina.c b/drivers/net/ethernet/korina.c
index 03e034918d14..af441d699a57 100644
--- a/drivers/net/ethernet/korina.c
+++ b/drivers/net/ethernet/korina.c
@@ -1113,7 +1113,7 @@ static int korina_probe(struct platform_device *pdev)
return rc;
probe_err_register:
- kfree(lp->td_ring);
+ kfree(KSEG0ADDR(lp->td_ring));
probe_err_td_ring:
iounmap(lp->tx_dma_regs);
probe_err_dma_tx:
@@ -1133,6 +1133,7 @@ static int korina_remove(struct platform_device *pdev)
iounmap(lp->eth_regs);
iounmap(lp->rx_dma_regs);
iounmap(lp->tx_dma_regs);
+ kfree(KSEG0ADDR(lp->td_ring));
unregister_netdev(bif->dev);
free_netdev(bif->dev);
--
2.20.1
next prev parent reply other threads:[~2020-10-11 22:03 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-11 11:39 [PATCH] net: korina: free array used for rx/tx descriptors Valentin Vidic
2020-10-11 18:37 ` Willem de Bruijn
2020-10-11 21:21 ` Valentin Vidić
2020-10-11 22:03 ` Valentin Vidic [this message]
2020-10-11 22:53 ` [PATCH v2] net: korina: fix kfree of rx/tx descriptor array Willem de Bruijn
2020-10-12 17:07 ` Jakub Kicinski
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=20201011220329.13038-1-vvidic@valentin-vidic.from.hr \
--to=vvidic@valentin-vidic.from.hr \
--cc=akpm@linux-foundation.org \
--cc=davem@davemloft.net \
--cc=florian@openwrt.org \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mhabets@solarflare.com \
--cc=mst@redhat.com \
--cc=netdev@vger.kernel.org \
--cc=rischelp@idt.com \
--cc=roman@advem.lv \
--cc=rppt@kernel.org \
--cc=willemdebruijn.kernel@gmail.com \
/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).