* [PATCH] nfsd: recover: fix memory leak
@ 2016-03-07 10:10 Sudip Mukherjee
2016-03-14 18:46 ` J. Bruce Fields
0 siblings, 1 reply; 2+ messages in thread
From: Sudip Mukherjee @ 2016-03-07 10:10 UTC (permalink / raw)
To: J. Bruce Fields, Jeff Layton; +Cc: linux-kernel, linux-nfs, Sudip Mukherjee
nfsd4_cltrack_grace_start() will allocate the memory for grace_start but
when we returned due to error we missed freeing it.
Signed-off-by: Sudip Mukherjee <sudip.mukherjee@codethink.co.uk>
---
fs/nfsd/nfs4recover.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/fs/nfsd/nfs4recover.c b/fs/nfsd/nfs4recover.c
index 195fe26..66eaeb1 100644
--- a/fs/nfsd/nfs4recover.c
+++ b/fs/nfsd/nfs4recover.c
@@ -1266,6 +1266,7 @@ nfsd4_umh_cltrack_init(struct net *net)
/* XXX: The usermode helper s not working in container yet. */
if (net != &init_net) {
pr_warn("NFSD: attempt to initialize umh client tracking in a container ignored.\n");
+ kfree(grace_start);
return -EINVAL;
}
--
1.9.1
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: [PATCH] nfsd: recover: fix memory leak
2016-03-07 10:10 [PATCH] nfsd: recover: fix memory leak Sudip Mukherjee
@ 2016-03-14 18:46 ` J. Bruce Fields
0 siblings, 0 replies; 2+ messages in thread
From: J. Bruce Fields @ 2016-03-14 18:46 UTC (permalink / raw)
To: Sudip Mukherjee; +Cc: Jeff Layton, linux-kernel, linux-nfs
On Mon, Mar 07, 2016 at 03:40:03PM +0530, Sudip Mukherjee wrote:
> nfsd4_cltrack_grace_start() will allocate the memory for grace_start but
> when we returned due to error we missed freeing it.
Thanks, applying for 4.6.--b.
>
> Signed-off-by: Sudip Mukherjee <sudip.mukherjee@codethink.co.uk>
> ---
> fs/nfsd/nfs4recover.c | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/fs/nfsd/nfs4recover.c b/fs/nfsd/nfs4recover.c
> index 195fe26..66eaeb1 100644
> --- a/fs/nfsd/nfs4recover.c
> +++ b/fs/nfsd/nfs4recover.c
> @@ -1266,6 +1266,7 @@ nfsd4_umh_cltrack_init(struct net *net)
> /* XXX: The usermode helper s not working in container yet. */
> if (net != &init_net) {
> pr_warn("NFSD: attempt to initialize umh client tracking in a container ignored.\n");
> + kfree(grace_start);
> return -EINVAL;
> }
>
> --
> 1.9.1
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2016-03-14 18:46 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-03-07 10:10 [PATCH] nfsd: recover: fix memory leak Sudip Mukherjee
2016-03-14 18:46 ` J. Bruce Fields
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).