summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorValentin Vidic <vvidic@valentin-vidic.from.hr>2020-10-12 01:03:29 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2020-10-29 11:05:37 +0300
commit53a6960b65dec361f6ef025248b947444d662ce1 (patch)
treeae35bf9b730ff9b6497bb4a75a43780c69089199
parent788ecf7f307efb11b232a23dfc7598a31435f356 (diff)
downloadlinux-53a6960b65dec361f6ef025248b947444d662ce1.tar.xz
net: korina: fix kfree of rx/tx descriptor array
[ Upstream commit 3af5f0f5c74ecbaf757ef06c3f80d56751277637 ] 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> Acked-by: Willem de Bruijn <willemb@google.com> Signed-off-by: Jakub Kicinski <kuba@kernel.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
-rw-r--r--drivers/net/ethernet/korina.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/ethernet/korina.c b/drivers/net/ethernet/korina.c
index c051987aab83..7e6db87c26ae 100644
--- a/drivers/net/ethernet/korina.c
+++ b/drivers/net/ethernet/korina.c
@@ -1188,7 +1188,7 @@ out:
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:
@@ -1208,6 +1208,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);