Messages in this thread Patch in this message | | | From | Lars-Peter Clausen <> | Subject | [PATCH 1/2] regmap: Do not call regcache_exit from regcache_rbtree_init error path | Date | Tue, 15 Nov 2011 13:34:40 +0100 |
| |
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> --- drivers/base/regmap/regcache-rbtree.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/drivers/base/regmap/regcache-rbtree.c b/drivers/base/regmap/regcache-rbtree.c index e314984..e71320f 100644 --- a/drivers/base/regmap/regcache-rbtree.c +++ b/drivers/base/regmap/regcache-rbtree.c @@ -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 */ @@ -149,7 +150,7 @@ static int regcache_rbtree_init(struct regmap *map) return 0; err: - regcache_exit(map); + regcache_rbtree_exit(map); return ret; } -- 1.7.7.1
| |