mirror of
https://git.yoctoproject.org/meta-ti
synced 2026-07-17 14:57:47 +00:00
Koen Kooi
ebbeb55561
Also add script used to generate patches and SRC_URI Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> Signed-off-by: Denys Dmytriyenko <denys@ti.com>
56 lines
1.6 KiB
Diff
56 lines
1.6 KiB
Diff
From 57e4348929a3bc5c2cc6a49a92941fe96f23aeec Mon Sep 17 00:00:00 2001
|
|
From: Weston Andros Adamson <dros@netapp.com>
|
|
Date: Thu, 16 Feb 2012 11:17:05 -0500
|
|
Subject: [PATCH 17/72] NFSv4: fix server_scope memory leak
|
|
|
|
commit abe9a6d57b4544ac208401f9c0a4262814db2be4 upstream.
|
|
|
|
server_scope would never be freed if nfs4_check_cl_exchange_flags() returned
|
|
non-zero
|
|
|
|
Signed-off-by: Weston Andros Adamson <dros@netapp.com>
|
|
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
|
|
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
|
---
|
|
fs/nfs/nfs4proc.c | 15 +++++++++------
|
|
1 file changed, 9 insertions(+), 6 deletions(-)
|
|
|
|
diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
|
|
index 2ee398a..e527030 100644
|
|
--- a/fs/nfs/nfs4proc.c
|
|
+++ b/fs/nfs/nfs4proc.c
|
|
@@ -4876,8 +4876,10 @@ int nfs4_proc_exchange_id(struct nfs_client *clp, struct rpc_cred *cred)
|
|
clp->cl_rpcclient->cl_auth->au_flavor);
|
|
|
|
res.server_scope = kzalloc(sizeof(struct server_scope), GFP_KERNEL);
|
|
- if (unlikely(!res.server_scope))
|
|
- return -ENOMEM;
|
|
+ if (unlikely(!res.server_scope)) {
|
|
+ status = -ENOMEM;
|
|
+ goto out;
|
|
+ }
|
|
|
|
status = rpc_call_sync(clp->cl_rpcclient, &msg, RPC_TASK_TIMEOUT);
|
|
if (!status)
|
|
@@ -4894,12 +4896,13 @@ int nfs4_proc_exchange_id(struct nfs_client *clp, struct rpc_cred *cred)
|
|
clp->server_scope = NULL;
|
|
}
|
|
|
|
- if (!clp->server_scope)
|
|
+ if (!clp->server_scope) {
|
|
clp->server_scope = res.server_scope;
|
|
- else
|
|
- kfree(res.server_scope);
|
|
+ goto out;
|
|
+ }
|
|
}
|
|
-
|
|
+ kfree(res.server_scope);
|
|
+out:
|
|
dprintk("<-- %s status= %d\n", __func__, status);
|
|
return status;
|
|
}
|
|
--
|
|
1.7.9.4
|
|
|