From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (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 349A947CC64; Tue, 16 Jun 2026 17:33:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781631199; cv=none; b=Al5+JkuBYW2Aj81nyOiS389UF6fv6dJcTsf364UqSza2mHry4FG16iqqvF8TeseR+OP5Cn4Qhq1sXecTPyBy4Q8HnSLfik56ISC41AvR8Yi1HlgU9xyuQ8ihRVzNT2mCOiEN5K8ivJDlHnbmvw2NUQ1XdcmEKA1e68ebkvlU6xw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781631199; c=relaxed/simple; bh=FJReAtIqwW01LtUZduf6cMRWBVEeha6twrU0kYYUrug=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=BObsC8/K9QS/+pBxO+TkRed51j2SrLjI1TA5trAm7PZpVTi4QIb7X/XLwoJRC3mblO/r8i8KfO825Yn8O2Fj8IhCbsVarDFE8Q2zMy42FEhM0Urq71VWQVtTbBPOUs+wa1mUYWTx4gHbqY84OM8WQLqgpohJBL4v5upqWfGgcrQ= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=xoxHYsLz; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="xoxHYsLz" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1E65D1F000E9; Tue, 16 Jun 2026 17:33:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1781631198; bh=SOjLfgmS7t0sl8m1u972ceipsxvdLPj+eH1XLyaRD8E=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=xoxHYsLz0CB5rDWaubA2vBKvzJKXbtuoDhtXxLsW9rfC5qFQolU5izjwvyxY3Gc97 j3cCzbg5vqyRfIWHd6F6xbxt4SqXTBqTyAqYBIAnuoV4N/F7+/3EQToIpWK9Rsfi6x THYtzlge8j33o26gZQgpJEGaE+QLold7TdwXu/m8= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, stable , Zhaoyang Yu <2426767509@qq.com>, Andy Shevchenko Subject: [PATCH 6.1 142/522] tty: serial: pch_uart: add check for dma_alloc_coherent() Date: Tue, 16 Jun 2026 20:24:49 +0530 Message-ID: <20260616145132.733260915@linuxfoundation.org> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260616145125.307082728@linuxfoundation.org> References: <20260616145125.307082728@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Zhaoyang Yu <2426767509@qq.com> commit 6fe472c1bbbe238e91141f7cabc1226e96a60d43 upstream. Add a check for dma_alloc_coherent() failure to prevent a potential NULL pointer dereference in dma_handle_rx(). Properly release DMA channels and the PCI device reference using a goto ladder if the allocation fails. Fixes: 3c6a483275f4 ("Serial: EG20T: add PCH_UART driver") Cc: stable Signed-off-by: Zhaoyang Yu <2426767509@qq.com> Reviewed-by: Andy Shevchenko Link: https://patch.msgid.link/tencent_E328416B7CFD436F6029F2DF02AD7ED89C08@qq.com Signed-off-by: Greg Kroah-Hartman Signed-off-by: Greg Kroah-Hartman --- drivers/tty/serial/pch_uart.c | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) --- a/drivers/tty/serial/pch_uart.c +++ b/drivers/tty/serial/pch_uart.c @@ -694,8 +694,7 @@ static void pch_request_dma(struct uart_ if (!chan) { dev_err(priv->port.dev, "%s:dma_request_channel FAILS(Tx)\n", __func__); - pci_dev_put(dma_dev); - return; + goto err_pci_get; } priv->chan_tx = chan; @@ -709,18 +708,26 @@ static void pch_request_dma(struct uart_ if (!chan) { dev_err(priv->port.dev, "%s:dma_request_channel FAILS(Rx)\n", __func__); - dma_release_channel(priv->chan_tx); - priv->chan_tx = NULL; - pci_dev_put(dma_dev); - return; + goto err_req_tx; } /* Get Consistent memory for DMA */ priv->rx_buf_virt = dma_alloc_coherent(port->dev, port->fifosize, &priv->rx_buf_dma, GFP_KERNEL); + if (!priv->rx_buf_virt) + goto err_req_rx; priv->chan_rx = chan; pci_dev_put(dma_dev); + return; + +err_req_rx: + dma_release_channel(chan); +err_req_tx: + dma_release_channel(priv->chan_tx); + priv->chan_tx = NULL; +err_pci_get: + pci_dev_put(dma_dev); } static void pch_dma_rx_complete(void *arg)