From c0c1865c3b8ad8f1231b14dbb1c9208d27c92a61 Mon Sep 17 00:00:00 2001

From: Valentin Vidic <vvidic@valentin-vidic.from.hr>

Date: Mon, 12 Oct 2020 00:03:29 +0200

Subject: [PATCH 7/8] net: korina: fix kfree of rx/tx descriptor array

Git-commit: 3af5f0f5c74ecbaf757ef06c3f80d56751277637

Patch-mainline: v5.10-rc1

References: git-fixes

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: Denis Kirjanov <denis.kirjanov@suse.com>

---

 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 3c0a6451273d..1357d464e8c4 100644

--- a/drivers/net/ethernet/korina.c

+++ b/drivers/net/ethernet/korina.c

@@ -1188,7 +1188,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:

@@ -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);

-- 

2.16.4