summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBen Greear <greearb@candelatech.com>2011-07-12 10:27:55 -0700
committerGreg Kroah-Hartman <gregkh@suse.de>2011-08-03 12:42:35 -0700
commitbfa71434e40f632d466ce7b57857f1e159c4605e (patch)
treeeaebfe106a2dab329ccab959121e23cc23d23e82
parent7d95a21c6893359dd0bc29663e2ad5554c1a6ed2 (diff)
downloadlinux-stable-bfa71434e40f632d466ce7b57857f1e159c4605e.tar.gz
linux-stable-bfa71434e40f632d466ce7b57857f1e159c4605e.tar.bz2
linux-stable-bfa71434e40f632d466ce7b57857f1e159c4605e.zip
SUNRPC: Fix use of static variable in rpcb_getport_async
commit ec0dd267bf7d08cb30e321e45a75fd40edd7e528 upstream. Because struct rpcbind_args *map was declared static, if two threads entered this method at the same time, the values assigned to map could be sent two two differen tasks. This could cause all sorts of problems, include use-after-free and double-free of memory. Fix this by removing the static declaration so that the map pointer is on the stack. Signed-off-by: Ben Greear <greearb@candelatech.com> Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--net/sunrpc/rpcb_clnt.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/sunrpc/rpcb_clnt.c b/net/sunrpc/rpcb_clnt.c
index c652e4cc9fe9..9574bc4ec737 100644
--- a/net/sunrpc/rpcb_clnt.c
+++ b/net/sunrpc/rpcb_clnt.c
@@ -528,7 +528,7 @@ void rpcb_getport_async(struct rpc_task *task)
u32 bind_version;
struct rpc_xprt *xprt;
struct rpc_clnt *rpcb_clnt;
- static struct rpcbind_args *map;
+ struct rpcbind_args *map;
struct rpc_task *child;
struct sockaddr_storage addr;
struct sockaddr *sap = (struct sockaddr *)&addr;