diff options
| author | Faiz Abbas <faiz_abbas@ti.com> | 2019-11-11 15:29:05 +0530 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-12-03 08:44:14 -0500 |
| commit | 42a4ee8a11bb230c81f27c14886cc2ee7ddf2c72 (patch) | |
| tree | 716638ef29794a28d1cad17076e079b8b700887a /drivers/core | |
| parent | ae3ef109c308652d2143019038a49b43917fdf12 (diff) | |
| download | u-boot-42a4ee8a11bb230c81f27c14886cc2ee7ddf2c72.zip u-boot-42a4ee8a11bb230c81f27c14886cc2ee7ddf2c72.tar.gz u-boot-42a4ee8a11bb230c81f27c14886cc2ee7ddf2c72.tar.bz2 | |
regmap: Fix potential memory leaks
Free allocated memory in case of an error in regmap_init_mem() and
regmap_init_mem_index().
Signed-off-by: Faiz Abbas <faiz_abbas@ti.com>
Diffstat (limited to 'drivers/core')
| -rw-r--r-- | drivers/core/regmap.c | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/drivers/core/regmap.c b/drivers/core/regmap.c index e9e55c9..a974744 100644 --- a/drivers/core/regmap.c +++ b/drivers/core/regmap.c @@ -134,7 +134,7 @@ int regmap_init_mem_index(ofnode node, struct regmap **mapp, int index) ret = init_range(node, map->ranges, addr_len, size_len, index); if (ret) - return ret; + goto err; if (ofnode_read_bool(node, "little-endian")) map->endianness = REGMAP_LITTLE_ENDIAN; @@ -147,6 +147,10 @@ int regmap_init_mem_index(ofnode node, struct regmap **mapp, int index) *mapp = map; + return 0; +err: + regmap_uninit(map); + return ret; } @@ -158,6 +162,7 @@ int regmap_init_mem(ofnode node, struct regmap **mapp) int addr_len, size_len, both_len; int len; int index; + int ret; addr_len = ofnode_read_simple_addr_cells(ofnode_get_parent(node)); if (addr_len < 0) { @@ -200,10 +205,9 @@ int regmap_init_mem(ofnode node, struct regmap **mapp) for (range = map->ranges, index = 0; count > 0; count--, range++, index++) { - int ret = init_range(node, range, addr_len, size_len, index); - + ret = init_range(node, range, addr_len, size_len, index); if (ret) - return ret; + goto err; } if (ofnode_read_bool(node, "little-endian")) @@ -218,6 +222,10 @@ int regmap_init_mem(ofnode node, struct regmap **mapp) *mapp = map; return 0; +err: + regmap_uninit(map); + + return ret; } #endif |