| Message ID | 20230205201130.11303-3-jsc@umbraculum.org (mailing list archive) |
|---|---|
| State | Changes Requested |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | Fix dma leaking | expand |
Hi Jonas, > -----Original Message----- > From: Jonas Suhr Christensen <jsc@umbraculum.org> > Sent: Monday, February 6, 2023 1:41 AM > To: netdev@vger.kernel.org > Cc: jsc@umbraculum.org; David S. Miller <davem@davemloft.net>; Eric > Dumazet <edumazet@google.com>; Jakub Kicinski <kuba@kernel.org>; > Paolo Abeni <pabeni@redhat.com>; Michal Simek > <michal.simek@xilinx.com>; Katakam, Harini <harini.katakam@amd.com>; > Haoyue Xu <xuhaoyue1@hisilicon.com>; huangjunxian > <huangjunxian6@hisilicon.com>; Christophe JAILLET > <christophe.jaillet@wanadoo.fr>; Yang Yingliang > <yangyingliang@huawei.com>; Esben Haabendal <esben@geanix.com>; > linux-arm-kernel@lists.infradead.org; linux-kernel@vger.kernel.org > Subject: [PATCH net v2 2/2] net: ll_temac: Reset buffer on dma_map_single() > errors > > To avoid later calls to dma_unmap_single() on address' > that fails to be mapped, free the allocated skb and > set the pointer of the address to NULL. Eg. when a mapping > fails temac_dma_bd_release() will try to call dma_unmap_single() > on that address if the structure is not reset. > > Fixes: d07c849cd2b9 ("net: ll_temac: Add more error handling of > dma_map_single() calls") > > Signed-off-by: Jonas Suhr Christensen <jsc@umbraculum.org> Thanks for the patch Reviewed-by: Harini Katakam <harini.katakam@amd.com> Regards, Harini
Jonas Suhr Christensen <jsc@umbraculum.org> writes: > To avoid later calls to dma_unmap_single() on address' > that fails to be mapped, free the allocated skb and > set the pointer of the address to NULL. Eg. when a mapping > fails temac_dma_bd_release() will try to call dma_unmap_single() > on that address if the structure is not reset. > > Fixes: d07c849cd2b9 ("net: ll_temac: Add more error handling of dma_map_single() calls") > > Signed-off-by: Jonas Suhr Christensen <jsc@umbraculum.org> Acked-by: Esben Haabendal <esben@geanix.com>
diff --git a/drivers/net/ethernet/xilinx/ll_temac_main.c b/drivers/net/ethernet/xilinx/ll_temac_main.c index 74423adbe50d..df43f5bc3bd3 100644 --- a/drivers/net/ethernet/xilinx/ll_temac_main.c +++ b/drivers/net/ethernet/xilinx/ll_temac_main.c @@ -376,8 +376,11 @@ static int temac_dma_bd_init(struct net_device *ndev) skb_dma_addr = dma_map_single(ndev->dev.parent, skb->data, XTE_MAX_JUMBO_FRAME_SIZE, DMA_FROM_DEVICE); - if (dma_mapping_error(ndev->dev.parent, skb_dma_addr)) + if (dma_mapping_error(ndev->dev.parent, skb_dma_addr)) { + dev_kfree_skb(lp->rx_skb[i]); + lp->rx_skb[i] = NULL; goto out; + } lp->rx_bd_v[i].phys = cpu_to_be32(skb_dma_addr); lp->rx_bd_v[i].len = cpu_to_be32(XTE_MAX_JUMBO_FRAME_SIZE); lp->rx_bd_v[i].app0 = cpu_to_be32(STS_CTRL_APP0_IRQONEND);
To avoid later calls to dma_unmap_single() on address' that fails to be mapped, free the allocated skb and set the pointer of the address to NULL. Eg. when a mapping fails temac_dma_bd_release() will try to call dma_unmap_single() on that address if the structure is not reset. Fixes: d07c849cd2b9 ("net: ll_temac: Add more error handling of dma_map_single() calls") Signed-off-by: Jonas Suhr Christensen <jsc@umbraculum.org> --- drivers/net/ethernet/xilinx/ll_temac_main.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)