Skip to content

Commit 3e4543b

Browse files
stmordretVinod Koul
authored andcommitted
dmaengine: stm32-dmamux: fix a potential buffer overflow
The bitfield dma_inuse is allocated of size dma_requests bits, thus a valid bit address is from 0 to (dma_requests - 1). When find_first_zero_bit() fails, it returns dma_requests as invalid address. Using such address for the following set_bit() is incorrect and, if dma_requests is a multiple of BITS_PER_LONG, it will cause a buffer overflow. Currently this driver is only used in DT stm32h743.dtsi where a safe value dma_requests=16 is not triggering the buffer overflow. Fixed by checking the return value of find_first_zero_bit() _before_ using it. Signed-off-by: Antonio Borneo <[email protected]> Signed-off-by: Pierre-Yves MORDRET <[email protected]> Signed-off-by: Vinod Koul <[email protected]>
1 parent 0c8efd6 commit 3e4543b

File tree

1 file changed

+6
-3
lines changed

1 file changed

+6
-3
lines changed

drivers/dma/stm32-dmamux.c

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -118,14 +118,15 @@ static void *stm32_dmamux_route_allocate(struct of_phandle_args *dma_spec,
118118
spin_lock_irqsave(&dmamux->lock, flags);
119119
mux->chan_id = find_first_zero_bit(dmamux->dma_inuse,
120120
dmamux->dma_requests);
121-
set_bit(mux->chan_id, dmamux->dma_inuse);
122-
spin_unlock_irqrestore(&dmamux->lock, flags);
123121

124122
if (mux->chan_id == dmamux->dma_requests) {
123+
spin_unlock_irqrestore(&dmamux->lock, flags);
125124
dev_err(&pdev->dev, "Run out of free DMA requests\n");
126125
ret = -ENOMEM;
127-
goto error;
126+
goto error_chan_id;
128127
}
128+
set_bit(mux->chan_id, dmamux->dma_inuse);
129+
spin_unlock_irqrestore(&dmamux->lock, flags);
129130

130131
/* Look for DMA Master */
131132
for (i = 1, min = 0, max = dmamux->dma_reqs[i];
@@ -173,6 +174,8 @@ static void *stm32_dmamux_route_allocate(struct of_phandle_args *dma_spec,
173174

174175
error:
175176
clear_bit(mux->chan_id, dmamux->dma_inuse);
177+
178+
error_chan_id:
176179
kfree(mux);
177180
return ERR_PTR(ret);
178181
}

0 commit comments

Comments
 (0)