summaryrefslogtreecommitdiffstats
path: root/fs/nfs/callback.c
diff options
context:
space:
mode:
authorVasily Averin <vvs@virtuozzo.com>2017-11-08 00:56:55 -0500
committerAnna Schumaker <Anna.Schumaker@Netapp.com>2017-11-17 16:43:51 -0500
commite4949e4b3d5e056bcecebd340d4c8fab7ed1c20d (patch)
treec79d33b1886f0bf828b7243063e601b14bd88b7c /fs/nfs/callback.c
parent4112be70becb82bc9a53cf2d11ab51c35602b063 (diff)
nfs: remove net pointer from messages
Publishing of net pointer is not safe, use net->ns.inum instead Signed-off-by: Vasily Averin <vvs@virtuozzo.com> Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
Diffstat (limited to 'fs/nfs/callback.c')
-rw-r--r--fs/nfs/callback.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/fs/nfs/callback.c b/fs/nfs/callback.c
index 2cddf7f437e6..387369c2107b 100644
--- a/fs/nfs/callback.c
+++ b/fs/nfs/callback.c
@@ -48,15 +48,15 @@ static int nfs4_callback_up_net(struct svc_serv *serv, struct net *net)
48 if (ret <= 0) 48 if (ret <= 0)
49 goto out_err; 49 goto out_err;
50 nn->nfs_callback_tcpport = ret; 50 nn->nfs_callback_tcpport = ret;
51 dprintk("NFS: Callback listener port = %u (af %u, net %p)\n", 51 dprintk("NFS: Callback listener port = %u (af %u, net %x)\n",
52 nn->nfs_callback_tcpport, PF_INET, net); 52 nn->nfs_callback_tcpport, PF_INET, net->ns.inum);
53 53
54 ret = svc_create_xprt(serv, "tcp", net, PF_INET6, 54 ret = svc_create_xprt(serv, "tcp", net, PF_INET6,
55 nfs_callback_set_tcpport, SVC_SOCK_ANONYMOUS); 55 nfs_callback_set_tcpport, SVC_SOCK_ANONYMOUS);
56 if (ret > 0) { 56 if (ret > 0) {
57 nn->nfs_callback_tcpport6 = ret; 57 nn->nfs_callback_tcpport6 = ret;
58 dprintk("NFS: Callback listener port = %u (af %u, net %p)\n", 58 dprintk("NFS: Callback listener port = %u (af %u, net %x\n",
59 nn->nfs_callback_tcpport6, PF_INET6, net); 59 nn->nfs_callback_tcpport6, PF_INET6, net->ns.inum);
60 } else if (ret != -EAFNOSUPPORT) 60 } else if (ret != -EAFNOSUPPORT)
61 goto out_err; 61 goto out_err;
62 return 0; 62 return 0;
@@ -184,7 +184,7 @@ static void nfs_callback_down_net(u32 minorversion, struct svc_serv *serv, struc
184 if (--nn->cb_users[minorversion]) 184 if (--nn->cb_users[minorversion])
185 return; 185 return;
186 186
187 dprintk("NFS: destroy per-net callback data; net=%p\n", net); 187 dprintk("NFS: destroy per-net callback data; net=%x\n", net->ns.inum);
188 svc_shutdown_net(serv, net); 188 svc_shutdown_net(serv, net);
189} 189}
190 190
@@ -197,7 +197,7 @@ static int nfs_callback_up_net(int minorversion, struct svc_serv *serv,
197 if (nn->cb_users[minorversion]++) 197 if (nn->cb_users[minorversion]++)
198 return 0; 198 return 0;
199 199
200 dprintk("NFS: create per-net callback data; net=%p\n", net); 200 dprintk("NFS: create per-net callback data; net=%x\n", net->ns.inum);
201 201
202 ret = svc_bind(serv, net); 202 ret = svc_bind(serv, net);
203 if (ret < 0) { 203 if (ret < 0) {
@@ -222,7 +222,7 @@ err_socks:
222err_bind: 222err_bind:
223 nn->cb_users[minorversion]--; 223 nn->cb_users[minorversion]--;
224 dprintk("NFS: Couldn't create callback socket: err = %d; " 224 dprintk("NFS: Couldn't create callback socket: err = %d; "
225 "net = %p\n", ret, net); 225 "net = %x\n", ret, net->ns.inum);
226 return ret; 226 return ret;
227} 227}
228 228