Unverified Commit 00bb549d authored by Richard Fitzgerald's avatar Richard Fitzgerald Committed by Mark Brown
Browse files

regmap: maple: Fix cache corruption in regcache_maple_drop() 



When keeping the upper end of a cache block entry, the entry[] array
must be indexed by the offset from the base register of the block,
i.e. max - mas.index.

The code was indexing entry[] by only the register address, leading
to an out-of-bounds access that copied some part of the kernel
memory over the cache contents.

This bug was not detected by the regmap KUnit test because it only
tests with a block of registers starting at 0, so mas.index == 0.

Signed-off-by: default avatarRichard Fitzgerald <rf@opensource.cirrus.com>
Fixes: f033c26d ("regmap: Add maple tree based register cache")
Link: https://msgid.link/r/20240327114406.976986-1-rf@opensource.cirrus.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 4cece764

drivers/base/regmap/regcache-maple.c

+1 −1
Original line number Diff line number Diff line
@@ -145,7 +145,7 @@ static int regcache_maple_drop(struct regmap *map, unsigned int min, 
			upper_index = max + 1;

			upper_last = mas.last;



			upper = kmemdup(&entry[max + 1],

			upper = kmemdup(&entry[max - mas.index + 1],

					((mas.last - max) *

					 sizeof(unsigned long)),

					map->alloc_flags);