From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=100.103.45.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1795030975; b=NXeXUEokQMBwDQQ6UcWxRsUu6DvDt35c0fPPUxFHUbD31egVgQK1qh3W60I/wY1K4aCR 5D1HKxmYn8MonO0qUg8hpHNKMgFzArMHk3A23dLlPeSFeqPxAxE7nzKmdYVjw+B11fL+t sQbfepdVq/5b3ydUQAB6tab1lL7PSI2iKXCI7x5oUZYWxfZiHah1soxyeJBaFMOChIvyU S2RTCkM1dogQ4600HU2IoccDR09FvkiyuhTTduzAlDam2Vb9UecdggOdO7XW84WksEqn8 OxZuKIoReUQmMvGDGHFaY0s3yx7LWzsubB/CBEsMtXQc+kQy9w8Yrz/I4z8ygaH+qnA== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795030975; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: In-Reply-To:References:User-Agent:X-stable:X-Patchwork-Hint: MIME-Version:Content-Transfer-Encoding; bh=VwF/oYjU5bztiIjseUkQ7R9OH0qexshUaD03twW0FJE=; b=m0OCG/QO0VR3WjV3wrK4s+CV5dfKmFBeKxgLCmo1FvyYrXtcLkCO8JzIcCj68tsl4P1X clgBqmeq122a3vdJRI88wIpMCyx26EchdZpscR/i4HfeBCMtY+wYnx0Kc8HcLY4uCuear YiuI1zeBmgFxP0eTMYM6kwGVDUpQUwRFNseHghQHiDU6gmVzBfbM1m+MEaxC2MGPj1xT/ xGYRo0zJn80IUCdwTyvqY5EeBFK7BLaReTeGNl4znLa6FuT95qW3HoUN6u8Qi9HB+vE3O bwJnI2Ji+4b01iKp4OR2/B5Mji8NpEqg7CYmczp2I6kRxWvtO8djQCGROw0ngq/ofAQ== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=FRmGqTrV; arc=none smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0B9D1606A7C2; Wed, 18 Nov 2026 19:42:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=FRmGqTrV Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6117A1F000C4; Wed, 18 Nov 2026 19:42:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1795030974; bh=VwF/oYjU5bztiIjseUkQ7R9OH0qexshUaD03twW0FJE=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=FRmGqTrVt4BOASVzwpCkm3FjcYJkDKIKYKKj2l51iTm5ljdE8wM3j9cWFG3oKFrWu o7p+kqU9c2ecWFTfuQ7w49lSP/Ls1RSJ+FEsL8EUtBuk6hJlg+Bf2Ddf4xM+YxrQcB i9Qt/6dJM5YYxK/imGkgBZDkDsWp54iVqcSf4I+w= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, sashiko-bot@kernel.org, Frank Li , Linus Walleij , Vinod Koul , Sasha Levin Subject: [PATCH 6.12 0895/1756] dmaengine: ste_dma40: Reject direction changes after allocation Date: Wed, 18 Nov 2026 15:50:22 +0100 Message-ID: <20261118150045.606088625@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261118150007.957976754@linuxfoundation.org> References: <20261118150007.957976754@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore X-Mailing-List: stable@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.12-stable review patch. If anyone has any objections, please let me know. ------------------ From: Linus Walleij [ Upstream commit 77ebc64f40717b8501793b5f5ee717a141e62e8e ] Logical channel allocation uses the configured direction to select the source or destination allocation mask, derive the logical channel number, and choose the LCPA location. d40_set_runtime_config_write() nevertheless overwrites the configured direction when a transfer is prepared for the opposite direction. d40_free_dma() then clears the wrong allocation mask, leaking the original resource and potentially releasing one used by another client. Reject directions that differ from the direction used during allocation and propagate runtime configuration errors to callers. Skip slave runtime configuration for memcpy transfers, which also use d40_prep_sg() but do not require it. Fixes: 95e1400fa131 ("DMAENGINE: add runtime slave config to DMA40 v3") Reported-by: sashiko-bot@kernel.org Closes: https://lore.kernel.org/dmaengine/20260618051539.15E201F000E9@smtp.kernel.org/ Assisted-by: LLM Reviewed-by: Frank Li Signed-off-by: Linus Walleij Link: https://patch.msgid.link/20260927-dma40-fixes-v7-18-89f595e8851d@kernel.org Signed-off-by: Vinod Koul Signed-off-by: Sasha Levin --- drivers/dma/ste_dma40.c | 29 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/drivers/dma/ste_dma40.c b/drivers/dma/ste_dma40.c index bc4e30d46bdc9..5c2a13b2f826d 100644 --- a/drivers/dma/ste_dma40.c +++ b/drivers/dma/ste_dma40.c @@ -2268,7 +2268,13 @@ d40_prep_sg(struct dma_chan *dchan, struct scatterlist *sg_src, return NULL; } - d40_set_runtime_config_write(dchan, &chan->slave_config, direction); + if (direction != DMA_MEM_TO_MEM) { + ret = d40_set_runtime_config_write(dchan, + &chan->slave_config, + direction); + if (ret) + return NULL; + } spin_lock_irqsave(&chan->lock, flags); @@ -2723,6 +2729,13 @@ static int d40_set_runtime_config_write(struct dma_chan *chan, return -EINVAL; } + if (direction != cfg->dir) { + chan_err(d40c, + "transfer direction %d differs from allocated direction %d\n", + direction, cfg->dir); + return -EINVAL; + } + src_addr_width = config->src_addr_width; src_maxburst = config->src_maxburst; dst_addr_width = config->dst_addr_width; @@ -2731,13 +2744,6 @@ static int d40_set_runtime_config_write(struct dma_chan *chan, if (direction == DMA_DEV_TO_MEM) { config_addr = config->src_addr; - if (cfg->dir != DMA_DEV_TO_MEM) - dev_dbg(d40c->base->dev, - "channel was not configured for peripheral " - "to memory transfer (%d) overriding\n", - cfg->dir); - cfg->dir = DMA_DEV_TO_MEM; - /* Configure the memory side */ if (dst_addr_width == DMA_SLAVE_BUSWIDTH_UNDEFINED) dst_addr_width = src_addr_width; @@ -2747,13 +2753,6 @@ static int d40_set_runtime_config_write(struct dma_chan *chan, } else if (direction == DMA_MEM_TO_DEV) { config_addr = config->dst_addr; - if (cfg->dir != DMA_MEM_TO_DEV) - dev_dbg(d40c->base->dev, - "channel was not configured for memory " - "to peripheral transfer (%d) overriding\n", - cfg->dir); - cfg->dir = DMA_MEM_TO_DEV; - /* Configure the memory side */ if (src_addr_width == DMA_SLAVE_BUSWIDTH_UNDEFINED) src_addr_width = dst_addr_width; -- 2.53.0