pstore/ram: Fix memory leak in persistent_ram_new
Subsystems (2)
PATCH 1/1 pstore/ram: Fix memory leak in persistent_ram_new
In the implementation of persistent_ram_new(), if the allocation for prz fails, "label" should be released as part of error handling. Release the label via kfree().
--- fs/pstore/ram_core.c | 1 + 1 file changed, 1 insertion(+)
fs/pstore/ram_core.c +1 -0
@@ -568,6 +568,7 @@ struct persistent_ram_zone *persistent_ram_new(phys_addr_t start, size_t size, prz =kzalloc (sizeof (struct persistent_ram_zone ),GFP_KERNEL );if (!prz) {pr_err ("failed to allocate persistent ram zone\n" ); +kfree (label); goto err; }
Signature · 1 line
2.17.1
Quoted 2 lines
In the implementation of
persistent_ram_new(), if the allocation for prz fails, "label" should be released as part of error handling.
How did you come to this conclusion?
I suggest to reconsider this patch because the mentioned string is passed by a function parameter.
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/fs/pstore/ram_core.c?id7d4e84f765bb3038ddfeebdc5d1cfd7e1ef688f#n561
https://elixir.bootlin.com/linux/v5.5-rc1/source/fs/pstore/ram_core.c#L561
I recognise other implementation details which could be improved here.
https://lore.kernel.org/lkml/[email protected]/
https://lkml.org/lkml/2017/8/16/645
Regards,
Markus
Quoted 6 lines · Navid Emamdoost
In the implementation of
persistent_ram_new(), if the allocation for prz fails, "label" should be released as part of error handling. Release the label viakfree().Fixes 8cf5aff89e59 ("staging: android: persistent_ram: Introduce persistent_ram_new()")Signed-off-by Navid Emamdoost <[email protected]>
You're right about the need to clean up the allocation, but I think it's on the caller to do this, not persistent_ram_new(), in case a const char string is used in the future.
I think the "Fixes" should also be:
-Kees
Quoted 19 lines
--- fs/pstore/ram_core.c | 1 + 1 file changed, 1 insertion(+)fs/pstore/ram_core.c +1
-0@@ -568,6 +568,7 @@ struct persistent_ram_zone *persistent_ram_new(phys_addr_t start, size_t size, prz =kzalloc (sizeof (struct persistent_ram_zone ),GFP_KERNEL );if (!prz) {pr_err ("failed to allocate persistent ram zone\n" ); +kfree (label); goto err; }Signature · 1 line
2.17.1
Signature · 1 line
Kees Cook