diff options
author | Stanislav Kinsbursky <skinsbursky@parallels.com> | 2012-09-18 05:37:18 -0400 |
---|---|---|
committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2012-10-01 18:27:38 -0400 |
commit | 303a7ce92064c285a04c870f2dc0192fdb2968cb (patch) | |
tree | 314e49df1536acc5b7752a1f8609392a13a890a8 /fs/lockd | |
parent | e9406db20fecbfcab646bad157b4cfdc7cadddfb (diff) |
lockd: use rpc client's cl_nodename for id encoding
Taking hostname from uts namespace if not safe, because this cuold be
performind during umount operation on child reaper death. And in this case
current->nsproxy is NULL already.
Signed-off-by: Stanislav Kinsbursky <skinsbursky@parallels.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs/lockd')
-rw-r--r-- | fs/lockd/mon.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/fs/lockd/mon.c b/fs/lockd/mon.c index 38f240e104ce..e0bc36e74ceb 100644 --- a/fs/lockd/mon.c +++ b/fs/lockd/mon.c | |||
@@ -42,6 +42,7 @@ struct nsm_args { | |||
42 | u32 proc; | 42 | u32 proc; |
43 | 43 | ||
44 | char *mon_name; | 44 | char *mon_name; |
45 | char *nodename; | ||
45 | }; | 46 | }; |
46 | 47 | ||
47 | struct nsm_res { | 48 | struct nsm_res { |
@@ -141,6 +142,7 @@ static int nsm_mon_unmon(struct nsm_handle *nsm, u32 proc, struct nsm_res *res, | |||
141 | .vers = 3, | 142 | .vers = 3, |
142 | .proc = NLMPROC_NSM_NOTIFY, | 143 | .proc = NLMPROC_NSM_NOTIFY, |
143 | .mon_name = nsm->sm_mon_name, | 144 | .mon_name = nsm->sm_mon_name, |
145 | .nodename = utsname()->nodename, | ||
144 | }; | 146 | }; |
145 | struct rpc_message msg = { | 147 | struct rpc_message msg = { |
146 | .rpc_argp = &args, | 148 | .rpc_argp = &args, |
@@ -477,7 +479,7 @@ static void encode_my_id(struct xdr_stream *xdr, const struct nsm_args *argp) | |||
477 | { | 479 | { |
478 | __be32 *p; | 480 | __be32 *p; |
479 | 481 | ||
480 | encode_nsm_string(xdr, utsname()->nodename); | 482 | encode_nsm_string(xdr, argp->nodename); |
481 | p = xdr_reserve_space(xdr, 4 + 4 + 4); | 483 | p = xdr_reserve_space(xdr, 4 + 4 + 4); |
482 | *p++ = cpu_to_be32(argp->prog); | 484 | *p++ = cpu_to_be32(argp->prog); |
483 | *p++ = cpu_to_be32(argp->vers); | 485 | *p++ = cpu_to_be32(argp->vers); |