* [PATCH][next] ubifs: authentication: fix memory leak on error exit path
@ 2018-10-29 23:21 Colin King
2018-10-29 23:32 ` Richard Weinberger
0 siblings, 1 reply; 2+ messages in thread
From: Colin King @ 2018-10-29 23:21 UTC (permalink / raw)
To: Richard Weinberger, Artem Bityutskiy, Adrian Hunter, linux-mtd
Cc: kernel-janitors, linux-kernel
From: Colin Ian King <colin.king@canonical.com>
Currently a failure when calling ubifs_read_nnode results in a leak
of desc and buf because of a direct return. Fix this by exiting via
label 'out' that performs the necessary free'ing of the resources.
Fixes: a1dc58140f7e ("ubifs: authentication: Authenticate LPT")
Signed-off-by: Colin Ian King <colin.king@canonical.com>
---
fs/ubifs/lpt.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/fs/ubifs/lpt.c b/fs/ubifs/lpt.c
index d1d5e96350dd..c162459a1e02 100644
--- a/fs/ubifs/lpt.c
+++ b/fs/ubifs/lpt.c
@@ -1688,7 +1688,7 @@ int ubifs_lpt_calc_hash(struct ubifs_info *c, u8 *hash)
if (!c->nroot) {
err = ubifs_read_nnode(c, NULL, 0);
if (err)
- return err;
+ goto out;
}
cnode = (struct ubifs_cnode *)c->nroot;
--
2.19.1
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: [PATCH][next] ubifs: authentication: fix memory leak on error exit path
2018-10-29 23:21 [PATCH][next] ubifs: authentication: fix memory leak on error exit path Colin King
@ 2018-10-29 23:32 ` Richard Weinberger
0 siblings, 0 replies; 2+ messages in thread
From: Richard Weinberger @ 2018-10-29 23:32 UTC (permalink / raw)
To: Colin King
Cc: Artem Bityutskiy, Adrian Hunter, linux-mtd, kernel-janitors,
linux-kernel
Am Dienstag, 30. Oktober 2018, 00:21:46 CET schrieb Colin King:
> From: Colin Ian King <colin.king@canonical.com>
>
> Currently a failure when calling ubifs_read_nnode results in a leak
> of desc and buf because of a direct return. Fix this by exiting via
> label 'out' that performs the necessary free'ing of the resources.
>
> Fixes: a1dc58140f7e ("ubifs: authentication: Authenticate LPT")
>
> Signed-off-by: Colin Ian King <colin.king@canonical.com>
> ---
> fs/ubifs/lpt.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/fs/ubifs/lpt.c b/fs/ubifs/lpt.c
> index d1d5e96350dd..c162459a1e02 100644
> --- a/fs/ubifs/lpt.c
> +++ b/fs/ubifs/lpt.c
> @@ -1688,7 +1688,7 @@ int ubifs_lpt_calc_hash(struct ubifs_info *c, u8 *hash)
> if (!c->nroot) {
> err = ubifs_read_nnode(c, NULL, 0);
> if (err)
> - return err;
> + goto out;
IMHO a better fix would be reading the root node before allocating these buffers.
Thanks,
//richard
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2018-10-29 23:32 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-10-29 23:21 [PATCH][next] ubifs: authentication: fix memory leak on error exit path Colin King
2018-10-29 23:32 ` Richard Weinberger
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox