question about current code in async op

[Olga Kornievskaia <aglo@xxxxxxxxx>]

Hi folks,

As I was writing a new async operation I was looking at other async
functions for guidance (i.e.., nfs4_do_close()) and I noticed what
looks to me like a memory leak. Am I missing something?

I don’t see that “calldata” is freed if rpc_run_task() fails.

Thoughts?

Here’s what I have to fix it:

diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
index d293f06..408cb5b 100644
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@ -3317,8 +3317,10 @@ int nfs4_do_close(struct nfs4_state *state,
gfp_t gfp_mask, int wait)
  msg.rpc_resp = &calldata->res;
  task_setup_data.callback_data = calldata;
  task = rpc_run_task(&task_setup_data);
- if (IS_ERR(task))
+ if (IS_ERR(task)) {
+ kfree(calldata);
  return PTR_ERR(task);
+ }
  status = 0;
  if (wait)
  status = rpc_wait_for_completion_task(task);
@@ -6023,6 +6025,7 @@ static struct rpc_task *nfs4_do_unlck(struct
file_lock *fl,
  .workqueue = nfsiod_workqueue,
  .flags = RPC_TASK_ASYNC,
  };
+ struct rpc_task *task;



  nfs4_state_protect(NFS_SERVER(lsp->ls_state->inode)->nfs_client,
  NFS_SP4_MACH_CRED_CLEANUP, &task_setup_data.rpc_client, &msg);
@@ -6042,7 +6045,10 @@ static struct rpc_task *nfs4_do_unlck(struct
file_lock *fl,
  msg.rpc_argp = &data->arg;
  msg.rpc_resp = &data->res;
  task_setup_data.callback_data = data;
- return rpc_run_task(&task_setup_data);
+ task = rpc_run_task(&task_setup_data);
+ if (IS_ERR(task))
+ kfree(data);
+ return task;
 }



 static int nfs4_proc_unlck(struct nfs4_state *state, int cmd, struct
file_lock *request)
@@ -6311,8 +6317,10 @@ static int _nfs4_do_setlk(struct nfs4_state
*state, int cmd, struct file_lock *f
  } else
  data->arg.new_lock = 1;
  task = rpc_run_task(&task_setup_data);
- if (IS_ERR(task))
+ if (IS_ERR(task)) {
+ kfree(data);
  return PTR_ERR(task);
+ }
  ret = nfs4_wait_for_completion_rpc_task(task);
  if (ret == 0) {
  ret = data->rpc_status;
--
To unsubscribe from this list: send the line "unsubscribe linux-nfs" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html