diff options
| author | Lars-Peter Clausen <lars@metafoo.de> | 2011-11-15 13:34:41 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-11-15 19:22:59 +0000 |
| commit | c2b1ecd13c6a7b19f1c0c48b68f61ab083f3ec3f (patch) | |
| tree | d895140a11bfaaa1e5240b69e1a94fc49168859e /drivers/base | |
| parent | 462a185c5cea7063348003c1644b70a6f6780f01 (diff) | |
| download | linux-c2b1ecd13c6a7b19f1c0c48b68f61ab083f3ec3f.tar.gz linux-c2b1ecd13c6a7b19f1c0c48b68f61ab083f3ec3f.tar.bz2 linux-c2b1ecd13c6a7b19f1c0c48b68f61ab083f3ec3f.zip | |
regmap: Do not call regcache_exit from regcache_lzo_init error path
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>
Diffstat (limited to 'drivers/base')
| -rw-r--r-- | drivers/base/regmap/regcache-lzo.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/base/regmap/regcache-lzo.c b/drivers/base/regmap/regcache-lzo.c index 226ffc13bc25..b7d16143edeb 100644 --- a/drivers/base/regmap/regcache-lzo.c +++ b/drivers/base/regmap/regcache-lzo.c @@ -15,6 +15,8 @@ #include "internal.h" +static int regcache_lzo_exit(struct regmap *map); + struct regcache_lzo_ctx { void *wmem; void *dst; @@ -193,7 +195,7 @@ static int regcache_lzo_init(struct regmap *map) return 0; err: - regcache_exit(map); + regcache_lzo_exit(map); return ret; } |