Skip to content

Commit

Permalink
regmap: Do not call regcache_exit from regcache_lzo_init error path
Browse files Browse the repository at this point in the history
Calling regcache_exit from regcache_lzo_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 462a185 commit c2b1ecd
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion drivers/base/regmap/regcache-lzo.c
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@

#include "internal.h"

static int regcache_lzo_exit(struct regmap *map);

struct regcache_lzo_ctx {
void *wmem;
void *dst;
Expand Down Expand Up @@ -193,7 +195,7 @@ static int regcache_lzo_init(struct regmap *map)

return 0;
err:
regcache_exit(map);
regcache_lzo_exit(map);
return ret;
}

Expand Down

0 comments on commit c2b1ecd

Please sign in to comment.