Skip to content

Commit 33c3842

Browse files
committed
regmap: maple: Fix cache corruption in regcache_maple_drop()
jira LE-1907 cve CVE-2024-36019 Rebuild_History Non-Buildable kernel-5.14.0-427.35.1.el9_4 commit-author Richard Fitzgerald <rf@opensource.cirrus.com> commit 00bb549 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: Richard Fitzgerald <rf@opensource.cirrus.com> Fixes: f033c26 ("regmap: Add maple tree based register cache") Link: https://msgid.link/r/20240327114406.976986-1-rf@opensource.cirrus.com Signed-off-by: Mark Brown <broonie@kernel.org> (cherry picked from commit 00bb549) Signed-off-by: Jonathan Maple <jmaple@ciq.com>
1 parent 2e550c8 commit 33c3842

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

drivers/base/regmap/regcache-maple.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ static int regcache_maple_drop(struct regmap *map, unsigned int min,
145145
upper_index = max + 1;
146146
upper_last = mas.last;
147147

148-
upper = kmemdup(&entry[max + 1],
148+
upper = kmemdup(&entry[max - mas.index + 1],
149149
((mas.last - max) *
150150
sizeof(unsigned long)),
151151
map->alloc_flags);

0 commit comments

Comments
 (0)