From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id DA3F141B906; Sat, 28 Feb 2026 17:45:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772300743; cv=none; b=SiZ1hgJr2JGhTZ2eOfU2r5YrwD5gDQprhIjnYc9twSUbcwl2KC42CkgAjWSgYZs6sXuplVG3iANKEgKVd0y4QMca01DcEF+NYJFxhmV1lWBUiED8MHi/lpF4R15wMeYU3sO/6Zr1GnScB2Zvw5H1X6hN3MN0TheHCJ26GjO6m7I= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772300743; c=relaxed/simple; bh=sVKXGti/1tHXqLvuJLqu4mRGLNaVilAoFO9v0XPvu+g=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=rcPD20DjLoIZtuElIttM6VWOtGCjj6oZ0MCNu6KxlYGzUg+65wTlzf1fqHqDHlvG/N7N/8A8mkZwIw5iSDKsuWkWECMN9l27hXn7gJKMN/mnjG9+ULBzQrFMGx4IxEdRYMw+cTjKJTF12HlI66XSdUg64UQkjXyamWtqFctaEDA= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=MQQFH9ze; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="MQQFH9ze" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1C4C9C116D0; Sat, 28 Feb 2026 17:45:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1772300743; bh=sVKXGti/1tHXqLvuJLqu4mRGLNaVilAoFO9v0XPvu+g=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=MQQFH9zesT6m37rbf7UWrwDzK8xtlyrIHR/EFRD2o/BsDO8gV0W48mddERrY/7uDT nsgNA8TJAzffcUtSrseyEZzXqLpati7cONguNfFqGY0Qvig12AEqyd2QBt0wFEs3mE c6iRPch3hfKKw7xVNUoUsD/tr5276ezSxE+Q/0mnjUt+dPEoMODArAS8Wb37CBdpig auEQnHnOfBJoDTmEoXVJtN1t7dCTJiVkWGQD885r7lxoQH3wkjfdtyX1cuhVDmQ0Nb qj8o2TUSslTVqqU8fLbFTW1JjGzjnKEItk7RsP0fBK8LLBmnhEqD8e1x0f91/PITCv nf5B+kja6krGg== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Thomas Fourier , "Christophe Leroy (CS GROUP)" , Paolo Abeni , Sasha Levin Subject: [PATCH 6.19 779/844] net: wan/fsl_ucc_hdlc: Fix dma_free_coherent() in uhdlc_memclean() Date: Sat, 28 Feb 2026 12:31:32 -0500 Message-ID: <20260228173244.1509663-780-sashal@kernel.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20260228173244.1509663-1-sashal@kernel.org> References: <20260228173244.1509663-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit From: Thomas Fourier [ Upstream commit 36bd7d5deef936c4e1e3cd341598140e5c14c1d3 ] 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) Fixes: c19b6d246a35 ("drivers/net: support hdlc function for QE-UCC") Cc: Signed-off-by: Thomas Fourier Link: https://patch.msgid.link/20260206085334.21195-2-fourier.thomas@gmail.com Signed-off-by: Paolo Abeni Signed-off-by: Sasha Levin --- drivers/net/wan/fsl_ucc_hdlc.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/drivers/net/wan/fsl_ucc_hdlc.c b/drivers/net/wan/fsl_ucc_hdlc.c index f999798a56127..dff84731343cc 100644 --- a/drivers/net/wan/fsl_ucc_hdlc.c +++ b/drivers/net/wan/fsl_ucc_hdlc.c @@ -790,18 +790,14 @@ static void uhdlc_memclean(struct ucc_hdlc_private *priv) if (priv->rx_buffer) { dma_free_coherent(priv->dev, - RX_BD_RING_LEN * MAX_RX_BUF_LENGTH, + (RX_BD_RING_LEN + TX_BD_RING_LEN) * MAX_RX_BUF_LENGTH, priv->rx_buffer, priv->dma_rx_addr); priv->rx_buffer = NULL; priv->dma_rx_addr = 0; - } - if (priv->tx_buffer) { - dma_free_coherent(priv->dev, - TX_BD_RING_LEN * MAX_RX_BUF_LENGTH, - priv->tx_buffer, priv->dma_tx_addr); priv->tx_buffer = NULL; priv->dma_tx_addr = 0; + } } -- 2.51.0