Skip to content
/ linux Public

Commit 0f85a96

Browse files
Thomas-fourierSasha Levin
authored andcommitted
net: wan/fsl_ucc_hdlc: Fix dma_free_coherent() in uhdlc_memclean()
[ Upstream commit 36bd7d5 ] The priv->rx_buffer and priv->tx_buffer are alloc'd together as contiguous buffers in uhdlc_init() but freed as two buffers in uhdlc_memclean(). Change the cleanup to only call dma_free_coherent() once on the whole buffer. Reviewed-by: Christophe Leroy (CS GROUP) <chleroy@kernel.org> Fixes: c19b6d2 ("drivers/net: support hdlc function for QE-UCC") Cc: <stable@vger.kernel.org> Signed-off-by: Thomas Fourier <fourier.thomas@gmail.com> Link: https://patch.msgid.link/20260206085334.21195-2-fourier.thomas@gmail.com Signed-off-by: Paolo Abeni <pabeni@redhat.com> Signed-off-by: Sasha Levin <sashal@kernel.org>
1 parent 63afc07 commit 0f85a96

File tree

1 file changed

+2
-6
lines changed

1 file changed

+2
-6
lines changed

drivers/net/wan/fsl_ucc_hdlc.c

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -790,18 +790,14 @@ static void uhdlc_memclean(struct ucc_hdlc_private *priv)
790790

791791
if (priv->rx_buffer) {
792792
dma_free_coherent(priv->dev,
793-
RX_BD_RING_LEN * MAX_RX_BUF_LENGTH,
793+
(RX_BD_RING_LEN + TX_BD_RING_LEN) * MAX_RX_BUF_LENGTH,
794794
priv->rx_buffer, priv->dma_rx_addr);
795795
priv->rx_buffer = NULL;
796796
priv->dma_rx_addr = 0;
797-
}
798797

799-
if (priv->tx_buffer) {
800-
dma_free_coherent(priv->dev,
801-
TX_BD_RING_LEN * MAX_RX_BUF_LENGTH,
802-
priv->tx_buffer, priv->dma_tx_addr);
803798
priv->tx_buffer = NULL;
804799
priv->dma_tx_addr = 0;
800+
805801
}
806802
}
807803

0 commit comments

Comments
 (0)