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 9F63615C158; Wed, 17 Sep 2025 13:02:46 +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=1758114166; cv=none; b=m0VpkXrvgaGoTDeUUG6jw0IesWzoIjCCiOo+zGAcBSdmEUwTTTUcDiABIxRq6MnvDO/f70EWiOxU/IukWQc9EW64mIi0RA0GvqnxkRo/HyEGZVnIHj7D9x9G11JOGRLcJ/XrxkUDnsqEcygRRQj0O/GI8Y03zxL55YW7KSnjJ88= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758114166; c=relaxed/simple; bh=Li2sSzjGqIvYxTFiGj5RNuccu0FOvpXEJVu253uPI/4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=R9RDTVpn0LsG7ST/zKueqlIajNpyMLdzWPO6F3jAOXG7pAlq4rW380UuPhqnacx5Vb3m7p7Ucsi9EV7zydrfUoBWRYdYXRYtdZ10o0xd3E8EGVQFqdoZl1p/9573S9VKElFblflzX52csq6uBYLvJRYOdEpY76cToa14ev5KAAI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=DOnO69U+; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="DOnO69U+" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1109EC4CEF0; Wed, 17 Sep 2025 13:02:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1758114166; bh=Li2sSzjGqIvYxTFiGj5RNuccu0FOvpXEJVu253uPI/4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=DOnO69U+MYCnNmFqQ6PHTK7gc9nM8tk66GZS7qEcudCxGkA41L3qXb9T0EzYGH+3u KOYKxpryj1FSz0vG4ujT4K/eoeHI/CHibSC+LE6xnhe5K6/SHW2sC63b60WzP6T5AM 6xN8QDoR59eopZwQ1+WonC/UfJu1P45Il8OIOIb0= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Anders Roxell , Vinod Koul , Sasha Levin Subject: [PATCH 6.1 65/78] dmaengine: ti: edma: Fix memory allocation size for queue_priority_map Date: Wed, 17 Sep 2025 14:35:26 +0200 Message-ID: <20250917123331.163462402@linuxfoundation.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20250917123329.576087662@linuxfoundation.org> References: <20250917123329.576087662@linuxfoundation.org> User-Agent: quilt/0.68 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: Anders Roxell [ Upstream commit e63419dbf2ceb083c1651852209c7f048089ac0f ] Fix a critical memory allocation bug in edma_setup_from_hw() where queue_priority_map was allocated with insufficient memory. The code declared queue_priority_map as s8 (*)[2] (pointer to array of 2 s8), but allocated memory using sizeof(s8) instead of the correct size. This caused out-of-bounds memory writes when accessing: queue_priority_map[i][0] = i; queue_priority_map[i][1] = i; The bug manifested as kernel crashes with "Oops - undefined instruction" on ARM platforms (BeagleBoard-X15) during EDMA driver probe, as the memory corruption triggered kernel hardening features on Clang. Change the allocation to use sizeof(*queue_priority_map) which automatically gets the correct size for the 2D array structure. Fixes: 2b6b3b742019 ("ARM/dmaengine: edma: Merge the two drivers under drivers/dma/") Signed-off-by: Anders Roxell Link: https://lore.kernel.org/r/20250830094953.3038012-1-anders.roxell@linaro.org Signed-off-by: Vinod Koul Signed-off-by: Sasha Levin --- drivers/dma/ti/edma.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/dma/ti/edma.c b/drivers/dma/ti/edma.c index 89e06c87a258b..f24a685da2a22 100644 --- a/drivers/dma/ti/edma.c +++ b/drivers/dma/ti/edma.c @@ -2072,8 +2072,8 @@ static int edma_setup_from_hw(struct device *dev, struct edma_soc_info *pdata, * priority. So Q0 is the highest priority queue and the last queue has * the lowest priority. */ - queue_priority_map = devm_kcalloc(dev, ecc->num_tc + 1, sizeof(s8), - GFP_KERNEL); + queue_priority_map = devm_kcalloc(dev, ecc->num_tc + 1, + sizeof(*queue_priority_map), GFP_KERNEL); if (!queue_priority_map) return -ENOMEM; -- 2.51.0