Skip to content

Commit

Permalink
RPC: Fix double free in portmapper code
Browse files Browse the repository at this point in the history 
rpc_run_task is guaranteed to always call ->rpc_release.

Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
  • Loading branch information
Trond Myklebust authored and Trond Myklebust committed Feb 3, 2007
1 parent a995e9e commit 54cc533
Showing 1 changed file with 5 additions and 3 deletions.
8 changes: 5 additions & 3 deletions net/sunrpc/pmap_clnt.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,10 @@ static inline void pmap_map_free(struct portmap_args *map)

static void pmap_map_release(void *data)
{
pmap_map_free(data);
struct portmap_args *map = data;

xprt_put(map->pm_xprt);
pmap_map_free(map);
}

static const struct rpc_call_ops pmap_getport_ops = {
Expand Down Expand Up @@ -133,7 +136,7 @@ void rpc_getport(struct rpc_task *task)
status = -EIO;
child = rpc_run_task(pmap_clnt, RPC_TASK_ASYNC, &pmap_getport_ops, map);
if (IS_ERR(child))
goto bailout;
goto bailout_nofree;
rpc_put_task(child);

task->tk_xprt->stat.bind_count++;
Expand Down Expand Up @@ -222,7 +225,6 @@ static void pmap_getport_done(struct rpc_task *child, void *data)
child->tk_pid, status, map->pm_port);

pmap_wake_portmap_waiters(xprt, status);
xprt_put(xprt);
}

/**
Expand Down

0 comments on commit 54cc533

Please sign in to comment.