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 B22AE440A16; Wed, 23 Sep 2026 14:49:43 +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=1790174984; cv=none; b=RspjebijFEbyvVArfvtYGjlBWQEEb2FjVzG632FuD4ireag3fNb2NzIKnlmZfPC+4T0i4EOwkJqzqMMtwHTZaKtWqxktERryFDoxyssVNlc41RqbmOR0hlNTsfw2uyfZUpJfuzhavyMAlvtDRkWP6Y/eNDfztnz94D/fNzwuRRw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790174984; c=relaxed/simple; bh=U6vnXeKLTg352Ov+MMmpjP2IrcKRjRNYLj4ymYkPuvc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=P6BQETXr7FGPNrRl/X4U1muoBV9OxQdTZjNaoEAFBrd5dMUJVNojxA9bIExYJxljQlp3Ko1savlBysq8ETKOaDgJBakRWo07zhzA8UFAlAH73i7ASfRfl16ZJLTXyOmvJ2ghZzfuvqJwy35KHsQiRoLsWTC+oyTQwa91prGWcEc= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=eMTAzrbS; 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="eMTAzrbS" Received: by smtp.kernel.org (Postfix) with ESMTPSA id B3C391F00898; Wed, 23 Sep 2026 14:49:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1790174983; bh=4lRv7QTrXVeuR1tzrYeY+xpUPcnlQbCgyLCF6LKHIHc=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=eMTAzrbSAscj1Y1wXFuKnyHWJEKFfYjhof7O7O86R/WQPhQ0NgD/VkjriWnm+7qaE JN//65TTGq38EuCIdOh7rsdWCvliF9swDvgOiC+O8sov6L6l7BKEt9vQz7O3ssMbk8 1VvjPYbBapNEEgnsOZy9YrFwtGKfAXNaSicuJQbs= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Christian Lugnberg , Frank Li , Vinod Koul Subject: [PATCH 6.18 240/398] dmaengine: sun6i: fix undefined behaviour in sun6i_dma_tx_status Date: Wed, 23 Sep 2026 16:05:14 +0200 Message-ID: <20260923140649.637856961@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260923140643.441954610@linuxfoundation.org> References: <20260923140643.441954610@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.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Christian Lugnberg commit 9096bdc8d930147f7c39a493a859acbd3a8485d8 upstream. sun6i_dma_tx_status() calls vchan_find_desc() to look up the virtual descriptor for a given cookie, before checking whether the pointer vd is NULL: vd = vchan_find_desc(&vchan->vc, cookie); txd = to_sun6i_desc(&vd->tx); /* vd may be NULL here */ if (vd) { for (lli = txd->v_lli; ...) vchan_find_desc() returns NULL when the descriptor has already been completed or is in-flight on a physical channel and no longer present in the virtual channel's descriptor list. When vd is NULL, to_sun6i_desc() is called unconditionally on &vd->tx before the NULL check, which is undefined behaviour. Move the call inside the if (vd) guard to ensure it is only reached with a valid pointer. vd = vchan_find_desc(&vchan->vc, cookie); if (vd) { struct sun6i_desc *txd = to_sun6i_desc(&vd->tx); for (lli = txd->v_lli; ...) Fixes: 555859308723 ("dmaengine: sun6i: Add driver for the Allwinner A31 DMA controller") Cc: stable@vger.kernel.org Assisted-by: Claude:claude-sonnet-4-6 Signed-off-by: Christian Lugnberg Reviewed-by: Frank Li Link: https://patch.msgid.link/20260817135723.12807-3-christian.lugnberg@soundtrack.io Signed-off-by: Vinod Koul Signed-off-by: Greg Kroah-Hartman --- drivers/dma/sun6i-dma.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) --- a/drivers/dma/sun6i-dma.c +++ b/drivers/dma/sun6i-dma.c @@ -971,7 +971,6 @@ static enum dma_status sun6i_dma_tx_stat struct sun6i_pchan *pchan = vchan->phy; struct sun6i_dma_lli *lli; struct virt_dma_desc *vd; - struct sun6i_desc *txd; enum dma_status ret; unsigned long flags; size_t bytes = 0; @@ -983,9 +982,9 @@ static enum dma_status sun6i_dma_tx_stat spin_lock_irqsave(&vchan->vc.lock, flags); vd = vchan_find_desc(&vchan->vc, cookie); - txd = to_sun6i_desc(&vd->tx); if (vd) { + struct sun6i_desc *txd = to_sun6i_desc(&vd->tx); for (lli = txd->v_lli; lli != NULL; lli = lli->v_lli_next) bytes += lli->len; } else if (!pchan || !pchan->desc) {