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=1795055965; b=lX0HzR1WDy3GFlKQzHg3Nba9sx3yLteNRv3kwvaE1w+q0dSuSvqA9rQiWgQRGBBqA1Ed /ePjODLSrOmzJltCv/lNDLW038TLRu8IBMWVDX8X42hCY/pB8JpF71wq5w3p4zZcgCgB6 ZiajUtGgEx27JENTtF/rclM1x8/O/iUDEeDf+dawwIGwMLGZ2YhBLzouP1y0A5yuxFJ7x IbiGxD410wZVWgad6vfXEKU12MIt+QdewbG+Y4qKG365NILbgUX2foFVgp3umIkXYzcUZ 4NLlkZQewSh2Rvkz/wN6/H8UYGu8PfFbhJpBWiIiycb/dnU4XNi05QPEET8al7kJ/LA== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795055965; 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=1vwf74y+vakg4rfK0p1lpdBcRA72PvU4nvpZlcxXezE=; b=ViSrz/dz/VkUGwCN+h43f8tRcKO6u/kImqKenHM0U786thWk7car/ODxgZLpwgHFUg3L cl+gKaROSXKu21CMrw8yAfpcancdXNJe1qs5qDctAoFgmyb+5D1zbNfrvrymDLEy3i66E tmvhh2iJ3zRBVHm+GLKC56LaN3nUBA34GzDC5nt7dVI7iqUiRtAUGpdHHQpgBRuPfS/+m Y9mWA0bOAZSWH12IoQN9AFhMVsWFLjkfSTJH7wLmapTp3lEHyx9Fj71WbjcJIwEPdP5o9 M/pyE1wFGIFimzD5lGCPt9+hS9it9ylwmdV06qFv+T2Nj13N9eKlZ2PywepCAnQvxhA== 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=KpjEPimu; 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 43B49606A320; Thu, 19 Nov 2026 02:39:25 +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=KpjEPimu Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9B8521F000C4; Thu, 19 Nov 2026 02:39:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1795055965; bh=1vwf74y+vakg4rfK0p1lpdBcRA72PvU4nvpZlcxXezE=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=KpjEPimuUujVChBksDkMOYiJC2wNa+ru7VM/uEmqzuiaYAvgSrxkvrzhUvrBWwu7g Trdgg4UN/Ny6GnRhIoqv/TGGpa+X6XmAWnJmgGXs6E0RQNwhoV0cr6addvKl9u3APT ij1maoEsiWGjZ4oZaDYO3l2Q0qn7f2hXZmD2EQjk= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, sashiko-bot@kernel.org, Linus Walleij , Frank Li , Vinod Koul , Sasha Levin Subject: [PATCH 5.15 1769/2214] dmaengine: ste_dma40: Fix logical channel bounds check Date: Wed, 18 Nov 2026 15:57:25 +0100 Message-ID: <20261118150122.291307966@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261118150009.797899913@linuxfoundation.org> References: <20261118150009.797899913@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore X-Mailing-List: patches@lists.linux.dev List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.15-stable review patch. If anyone has any objections, please let me know. ------------------ From: Linus Walleij [ Upstream commit 57938e0c2a24f9f792fe9f611391ef6b58d1aa21 ] d40_validate_conf() checks the raw dev_type against num_log_chans, but d40_allocate_channel() derives the lookup_log_chans index as either 2 * dev_type or 2 * dev_type + 1. Validate the dev_type against the derived logical channel index limit so channel allocation cannot write past lookup_log_chans. Fixes: 26955c07dcf3 ("dmaengine: ste_dma40: Amalgamate DMA source and destination channel numbers") Reported-by: sashiko-bot@kernel.org Closes: https://lore.kernel.org/dmaengine/20260618051539.15E201F000E9@smtp.kernel.org/ Assisted-by: LLM Signed-off-by: Linus Walleij Reviewed-by: Frank Li Link: https://patch.msgid.link/20260927-dma40-fixes-v7-19-89f595e8851d@kernel.org Signed-off-by: Vinod Koul Signed-off-by: Sasha Levin --- drivers/dma/ste_dma40.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/drivers/dma/ste_dma40.c b/drivers/dma/ste_dma40.c index fe674afa05286..4e3fba774358e 100644 --- a/drivers/dma/ste_dma40.c +++ b/drivers/dma/ste_dma40.c @@ -1739,15 +1739,26 @@ static int d40_validate_conf(struct d40_chan *d40c, { int res = 0; bool is_log = conf->mode == STEDMA40_MODE_LOGICAL; + bool invalid_dev_type = conf->dev_type < 0; if (!conf->dir) { chan_err(d40c, "Invalid direction.\n"); res = -EINVAL; } - if ((is_log && conf->dev_type > d40c->base->num_log_chans) || - (!is_log && conf->dev_type > d40c->base->num_phy_chans) || - (conf->dev_type < 0)) { + if (!invalid_dev_type && is_log) { + int max_dev_type; + + if (conf->dir == DMA_DEV_TO_MEM) + max_dev_type = DIV_ROUND_UP(d40c->base->num_log_chans, 2); + else + max_dev_type = d40c->base->num_log_chans / 2; + + invalid_dev_type = conf->dev_type >= max_dev_type; + } + + if (invalid_dev_type || + (!is_log && conf->dev_type > d40c->base->num_phy_chans)) { chan_err(d40c, "Invalid device type (%d)\n", conf->dev_type); res = -EINVAL; } -- 2.53.0