random-mirrors/smaeul-u-boot
1
0
Fork 0
mirror of https://github.com/smaeul/u-boot.git synced 2025-10-14 21:06:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

regmap: Fix potential memory leaks

Browse Source 
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>
This commit is contained in:
Faiz Abbas 2019-11-11 15:29:05 +05:30 committed by Tom Rini
parent ae3ef109c3
commit 42a4ee8a11
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/core/regmap.c
View File

@ -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); ret = init_range(node, map->ranges, addr_len, size_len, index);
if (ret) if (ret)
return ret; goto err;
if (ofnode_read_bool(node, "little-endian")) if (ofnode_read_bool(node, "little-endian"))
map->endianness = REGMAP_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; *mapp = map;
return 0;
err:
regmap_uninit(map);
return ret; return ret;
} }
@ -158,6 +162,7 @@ int regmap_init_mem(ofnode node, struct regmap **mapp)
int addr_len, size_len, both_len; int addr_len, size_len, both_len;
int len; int len;
int index; int index;
int ret;
addr_len = ofnode_read_simple_addr_cells(ofnode_get_parent(node)); addr_len = ofnode_read_simple_addr_cells(ofnode_get_parent(node));
if (addr_len < 0) { 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; for (range = map->ranges, index = 0; count > 0;
count--, range++, index++) { 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) if (ret)
return ret; goto err;
} }
if (ofnode_read_bool(node, "little-endian")) if (ofnode_read_bool(node, "little-endian"))
@ -218,6 +222,10 @@ int regmap_init_mem(ofnode node, struct regmap **mapp)
*mapp = map; *mapp = map;
return 0; return 0;
err:
regmap_uninit(map);
return ret;
} }
#endif #endif