Skip to content

Commit e4949e4

Browse files
vaverinamschuma-ntap
authored andcommitted
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>
1 parent 4112be7 commit e4949e4

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

fs/nfs/callback.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -48,15 +48,15 @@ static int nfs4_callback_up_net(struct svc_serv *serv, struct net *net)
4848
if (ret <= 0)
4949
goto out_err;
5050
nn->nfs_callback_tcpport = ret;
51-
dprintk("NFS: Callback listener port = %u (af %u, net %p)\n",
52-
nn->nfs_callback_tcpport, PF_INET, net);
51+
dprintk("NFS: Callback listener port = %u (af %u, net %x)\n",
52+
nn->nfs_callback_tcpport, PF_INET, net->ns.inum);
5353

5454
ret = svc_create_xprt(serv, "tcp", net, PF_INET6,
5555
nfs_callback_set_tcpport, SVC_SOCK_ANONYMOUS);
5656
if (ret > 0) {
5757
nn->nfs_callback_tcpport6 = ret;
58-
dprintk("NFS: Callback listener port = %u (af %u, net %p)\n",
59-
nn->nfs_callback_tcpport6, PF_INET6, net);
58+
dprintk("NFS: Callback listener port = %u (af %u, net %x\n",
59+
nn->nfs_callback_tcpport6, PF_INET6, net->ns.inum);
6060
} else if (ret != -EAFNOSUPPORT)
6161
goto out_err;
6262
return 0;
@@ -184,7 +184,7 @@ static void nfs_callback_down_net(u32 minorversion, struct svc_serv *serv, struc
184184
if (--nn->cb_users[minorversion])
185185
return;
186186

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);
188188
svc_shutdown_net(serv, net);
189189
}
190190

@@ -197,7 +197,7 @@ static int nfs_callback_up_net(int minorversion, struct svc_serv *serv,
197197
if (nn->cb_users[minorversion]++)
198198
return 0;
199199

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);
201201

202202
ret = svc_bind(serv, net);
203203
if (ret < 0) {
@@ -222,7 +222,7 @@ static int nfs_callback_up_net(int minorversion, struct svc_serv *serv,
222222
err_bind:
223223
nn->cb_users[minorversion]--;
224224
dprintk("NFS: Couldn't create callback socket: err = %d; "
225-
"net = %p\n", ret, net);
225+
"net = %x\n", ret, net->ns.inum);
226226
return ret;
227227
}
228228

0 commit comments

Comments
 (0)