Skip to content

Commit

Permalink
regmap: Do not call regcache_exit from regcache_rbtree_init error path
Browse files Browse the repository at this point in the history
Calling regcache_exit from regcache_rbtree_init is first of all a layering
violation and secondly will cause double frees. regcache_exit will free buffers
allocated by the core, but the core will also free the same buffers when the
cacheops init callback returns an error. Thus we end up with a double free.
Fix this by not calling regcache_exit but only free those buffers which, have
been allocated in this function.

Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Acked-by: Dimitris Papastamos <dp@opensource.wolfsonmicro.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
  • Loading branch information
Lars-Peter Clausen authored and Mark Brown committed Nov 15, 2011
1 parent bd061c7 commit 462a185
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion drivers/base/regmap/regcache-rbtree.c
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@

static int regcache_rbtree_write(struct regmap *map, unsigned int reg,
unsigned int value);
static int regcache_rbtree_exit(struct regmap *map);

struct regcache_rbtree_node {
/* the actual rbtree node holding this block */
Expand Down Expand Up @@ -149,7 +150,7 @@ static int regcache_rbtree_init(struct regmap *map)
return 0;

err:
regcache_exit(map);
regcache_rbtree_exit(map);
return ret;
}

Expand Down

0 comments on commit 462a185

Please sign in to comment.