mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-30 06:10:56 +00:00
percpu: do not search past bitmap when allocating an area
[ Upstream commit 8c43004af0
]
pcpu_find_block_fit() guarantees that a fit is found within
PCPU_BITMAP_BLOCK_BITS. Iteration is used to determine the first fit as
it compares against the block's contig_hint. This can lead to
incorrectly scanning past the end of the bitmap. The behavior was okay
given the check after for bit_off >= end and the correctness of the
hints from pcpu_find_block_fit().
This patch fixes this by bounding the end offset by the number of bits
in a chunk.
Signed-off-by: Dennis Zhou <dennis@kernel.org>
Reviewed-by: Peng Fan <peng.fan@nxp.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
parent
3e729a2c5a
commit
4794604a68
1 changed files with 2 additions and 1 deletions
|
@ -984,7 +984,8 @@ static int pcpu_alloc_area(struct pcpu_chunk *chunk, int alloc_bits,
|
|||
/*
|
||||
* Search to find a fit.
|
||||
*/
|
||||
end = start + alloc_bits + PCPU_BITMAP_BLOCK_BITS;
|
||||
end = min_t(int, start + alloc_bits + PCPU_BITMAP_BLOCK_BITS,
|
||||
pcpu_chunk_map_bits(chunk));
|
||||
bit_off = bitmap_find_next_zero_area(chunk->alloc_map, end, start,
|
||||
alloc_bits, align_mask);
|
||||
if (bit_off >= end)
|
||||
|
|
Loading…
Reference in a new issue