Commit d5f8d3fe authored by Trond Myklebust's avatar Trond Myklebust

NFSv41: Fix a memory leak in nfs41_proc_async_sequence()

If the call to rpc_call_async() fails, then the arguments will not be
freed, since there will be no call to nfs41_sequence_call_done
Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent d3f6baaa
...@@ -5078,18 +5078,27 @@ static int nfs4_proc_sequence(struct nfs_client *clp, struct rpc_cred *cred) ...@@ -5078,18 +5078,27 @@ static int nfs4_proc_sequence(struct nfs_client *clp, struct rpc_cred *cred)
&res, args.sa_cache_this, 1); &res, args.sa_cache_this, 1);
} }
struct nfs4_sequence_data {
struct nfs_client *clp;
struct nfs4_sequence_args args;
struct nfs4_sequence_res res;
};
static void nfs41_sequence_release(void *data) static void nfs41_sequence_release(void *data)
{ {
struct nfs_client *clp = (struct nfs_client *)data; struct nfs4_sequence_data *calldata = data;
struct nfs_client *clp = calldata->clp;
if (atomic_read(&clp->cl_count) > 1) if (atomic_read(&clp->cl_count) > 1)
nfs4_schedule_state_renewal(clp); nfs4_schedule_state_renewal(clp);
nfs_put_client(clp); nfs_put_client(clp);
kfree(calldata);
} }
static void nfs41_sequence_call_done(struct rpc_task *task, void *data) static void nfs41_sequence_call_done(struct rpc_task *task, void *data)
{ {
struct nfs_client *clp = (struct nfs_client *)data; struct nfs4_sequence_data *calldata = data;
struct nfs_client *clp = calldata->clp;
nfs41_sequence_done(clp, task->tk_msg.rpc_resp, task->tk_status); nfs41_sequence_done(clp, task->tk_msg.rpc_resp, task->tk_status);
...@@ -5106,19 +5115,16 @@ static void nfs41_sequence_call_done(struct rpc_task *task, void *data) ...@@ -5106,19 +5115,16 @@ static void nfs41_sequence_call_done(struct rpc_task *task, void *data)
} }
dprintk("%s rpc_cred %p\n", __func__, task->tk_msg.rpc_cred); dprintk("%s rpc_cred %p\n", __func__, task->tk_msg.rpc_cred);
out: out:
kfree(task->tk_msg.rpc_argp);
kfree(task->tk_msg.rpc_resp);
dprintk("<-- %s\n", __func__); dprintk("<-- %s\n", __func__);
} }
static void nfs41_sequence_prepare(struct rpc_task *task, void *data) static void nfs41_sequence_prepare(struct rpc_task *task, void *data)
{ {
struct nfs_client *clp; struct nfs4_sequence_data *calldata = data;
struct nfs_client *clp = calldata->clp;
struct nfs4_sequence_args *args; struct nfs4_sequence_args *args;
struct nfs4_sequence_res *res; struct nfs4_sequence_res *res;
clp = (struct nfs_client *)data;
args = task->tk_msg.rpc_argp; args = task->tk_msg.rpc_argp;
res = task->tk_msg.rpc_resp; res = task->tk_msg.rpc_resp;
...@@ -5136,8 +5142,7 @@ static const struct rpc_call_ops nfs41_sequence_ops = { ...@@ -5136,8 +5142,7 @@ static const struct rpc_call_ops nfs41_sequence_ops = {
static int nfs41_proc_async_sequence(struct nfs_client *clp, static int nfs41_proc_async_sequence(struct nfs_client *clp,
struct rpc_cred *cred) struct rpc_cred *cred)
{ {
struct nfs4_sequence_args *args; struct nfs4_sequence_data *calldata;
struct nfs4_sequence_res *res;
struct rpc_message msg = { struct rpc_message msg = {
.rpc_proc = &nfs4_procedures[NFSPROC4_CLNT_SEQUENCE], .rpc_proc = &nfs4_procedures[NFSPROC4_CLNT_SEQUENCE],
.rpc_cred = cred, .rpc_cred = cred,
...@@ -5145,20 +5150,18 @@ static int nfs41_proc_async_sequence(struct nfs_client *clp, ...@@ -5145,20 +5150,18 @@ static int nfs41_proc_async_sequence(struct nfs_client *clp,
if (!atomic_inc_not_zero(&clp->cl_count)) if (!atomic_inc_not_zero(&clp->cl_count))
return -EIO; return -EIO;
args = kzalloc(sizeof(*args), GFP_NOFS); calldata = kmalloc(sizeof(*calldata), GFP_NOFS);
res = kzalloc(sizeof(*res), GFP_NOFS); if (calldata == NULL) {
if (!args || !res) {
kfree(args);
kfree(res);
nfs_put_client(clp); nfs_put_client(clp);
return -ENOMEM; return -ENOMEM;
} }
res->sr_slotid = NFS4_MAX_SLOT_TABLE; calldata->res.sr_slotid = NFS4_MAX_SLOT_TABLE;
msg.rpc_argp = args; msg.rpc_argp = &calldata->args;
msg.rpc_resp = res; msg.rpc_resp = &calldata->res;
calldata->clp = clp;
return rpc_call_async(clp->cl_rpcclient, &msg, RPC_TASK_SOFT, return rpc_call_async(clp->cl_rpcclient, &msg, RPC_TASK_SOFT,
&nfs41_sequence_ops, (void *)clp); &nfs41_sequence_ops, calldata);
} }
struct nfs4_reclaim_complete_data { struct nfs4_reclaim_complete_data {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment