Skip to content

Commit 55e6d80

Browse files
Yang Yingliangbroonie
authored andcommitted
regmap: Fix possible double-free in regcache_rbtree_exit()
In regcache_rbtree_insert_to_block(), when 'present' realloc failed, the 'blk' which is supposed to assign to 'rbnode->block' will be freed, so 'rbnode->block' points a freed memory, in the error handling path of regcache_rbtree_init(), 'rbnode->block' will be freed again in regcache_rbtree_exit(), KASAN will report double-free as follows: BUG: KASAN: double-free or invalid-free in kfree+0xce/0x390 Call Trace: slab_free_freelist_hook+0x10d/0x240 kfree+0xce/0x390 regcache_rbtree_exit+0x15d/0x1a0 regcache_rbtree_init+0x224/0x2c0 regcache_init+0x88d/0x1310 __regmap_init+0x3151/0x4a80 __devm_regmap_init+0x7d/0x100 madera_spi_probe+0x10f/0x333 [madera_spi] spi_probe+0x183/0x210 really_probe+0x285/0xc30 To fix this, moving up the assignment of rbnode->block to immediately after the reallocation has succeeded so that the data structure stays valid even if the second reallocation fails. Reported-by: Hulk Robot <[email protected]> Fixes: 3f4ff56 ("regmap: rbtree: Make cache_present bitmap per node") Signed-off-by: Yang Yingliang <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Mark Brown <[email protected]>
1 parent d287801 commit 55e6d80

File tree

1 file changed

+3
-4
lines changed

1 file changed

+3
-4
lines changed

drivers/base/regmap/regcache-rbtree.c

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -281,14 +281,14 @@ static int regcache_rbtree_insert_to_block(struct regmap *map,
281281
if (!blk)
282282
return -ENOMEM;
283283

284+
rbnode->block = blk;
285+
284286
if (BITS_TO_LONGS(blklen) > BITS_TO_LONGS(rbnode->blklen)) {
285287
present = krealloc(rbnode->cache_present,
286288
BITS_TO_LONGS(blklen) * sizeof(*present),
287289
GFP_KERNEL);
288-
if (!present) {
289-
kfree(blk);
290+
if (!present)
290291
return -ENOMEM;
291-
}
292292

293293
memset(present + BITS_TO_LONGS(rbnode->blklen), 0,
294294
(BITS_TO_LONGS(blklen) - BITS_TO_LONGS(rbnode->blklen))
@@ -305,7 +305,6 @@ static int regcache_rbtree_insert_to_block(struct regmap *map,
305305
}
306306

307307
/* update the rbnode block, its size and the base register */
308-
rbnode->block = blk;
309308
rbnode->blklen = blklen;
310309
rbnode->base_reg = base_reg;
311310
rbnode->cache_present = present;

0 commit comments

Comments
 (0)