]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
dmaengine: ti: edma: Fix memory allocation size for queue_priority_map
authorAnders Roxell <anders.roxell@linaro.org>
Sat, 30 Aug 2025 09:49:53 +0000 (11:49 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 19 Sep 2025 14:35:50 +0000 (16:35 +0200)
[ 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 <anders.roxell@linaro.org>
Link: https://lore.kernel.org/r/20250830094953.3038012-1-anders.roxell@linaro.org
Signed-off-by: Vinod Koul <vkoul@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/dma/ti/edma.c

index 7f861fb07cb8374e62bf39f46f82ad37ea0b8c00..6333426b4c96c50e1d9ec5f921540ef25522f0aa 100644 (file)
@@ -2063,8 +2063,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;