The patch titled
RPM: fix double free in portmapper code
has been added to the -mm tree. Its filename is
rpc-fix-double-free-in-portmapper-code.patch
*** Remember to use Documentation/SubmitChecklist when testing your code ***
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: RPM: fix double free in portmapper code
From: Trond Myklebust <Trond.Myklebust@xxxxxxxxxx>
rpc_run_task is guaranteed to always call ->rpc_release.
Signed-off-by: Trond Myklebust <Trond.Myklebust@xxxxxxxxxx>
Cc: Neil Brown <neilb@xxxxxxx>
Cc: Jan "Yenya" Kasprzak <kas@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
net/sunrpc/pmap_clnt.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff -puN net/sunrpc/pmap_clnt.c~rpc-fix-double-free-in-portmapper-code net/sunrpc/pmap_clnt.c
--- a/net/sunrpc/pmap_clnt.c~rpc-fix-double-free-in-portmapper-code
+++ a/net/sunrpc/pmap_clnt.c
@@ -62,7 +62,10 @@ static inline void pmap_map_free(struct
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 = {
@@ -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++;
@@ -222,7 +225,6 @@ static void pmap_getport_done(struct rpc
child->tk_pid, status, map->pm_port);
pmap_wake_portmap_waiters(xprt, status);
- xprt_put(xprt);
}
/**
_
Patches currently in -mm which might be from Trond.Myklebust@xxxxxxxxxx are
nlm-fix-double-free-in-__nlm_async_call.patch
auth_gss-unregister-gss_domain-when-unloading-module.patch
nfs-kill-the-obsolete-nfs_paranoia.patch
rpc-fix-double-free-in-portmapper-code.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
