lkml.org 
[lkml]   [2011]   [Nov]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 2/2] regmap: Do not call regcache_exit from regcache_lzo_init error path
    Date
    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>
    ---
    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 226ffc1..b7d1614 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;
    }

    --
    1.7.7.1



    \
     
     \ /
      Last update: 2011-11-15 13:37    [W:0.047 / U:0.540 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site