Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6c67a3e4 authored by Vasily Averin's avatar Vasily Averin Committed by Anna Schumaker
Browse files

sunrpc: remove net pointer from messages 



Publishing of net pointer is not safe, use net->ns.inum as net ID
[  171.391947] RPC:       created new rpcb local clients
    (rpcb_local_clnt: ..., rpcb_local_clnt4: ...) for net f00001e7
[  171.767188] NFSD: starting 90-second grace period (net f00001e7)

Signed-off-by: default avatarVasily Averin <vvs@virtuozzo.com>
Signed-off-by: default avatarAnna Schumaker <Anna.Schumaker@Netapp.com>
parent e4949e4b

net/sunrpc/rpc_pipe.c

+4 −4
Original line number Diff line number Diff line
@@ -1410,8 +1410,8 @@ rpc_fill_super(struct super_block *sb, void *data, int silent) 
		return PTR_ERR(gssd_dentry);

	}



	dprintk("RPC:       sending pipefs MOUNT notification for net %p%s\n",

		net, NET_NAME(net));

	dprintk("RPC:       sending pipefs MOUNT notification for net %x%s\n",

		net->ns.inum, NET_NAME(net));

	mutex_lock(&sn->pipefs_sb_lock);

	sn->pipefs_sb = sb;

	err = blocking_notifier_call_chain(&rpc_pipefs_notifier_list,
@@ -1462,8 +1462,8 @@ static void rpc_kill_sb(struct super_block *sb) 
		goto out;

	}

	sn->pipefs_sb = NULL;

	dprintk("RPC:       sending pipefs UMOUNT notification for net %p%s\n",

		net, NET_NAME(net));

	dprintk("RPC:       sending pipefs UMOUNT notification for net %x%s\n",

		net->ns.inum, NET_NAME(net));

	blocking_notifier_call_chain(&rpc_pipefs_notifier_list,

					   RPC_PIPEFS_UMOUNT,

					   sb);

net/sunrpc/rpcb_clnt.c

+3 −3
Original line number Diff line number Diff line
@@ -216,9 +216,9 @@ static void rpcb_set_local(struct net *net, struct rpc_clnt *clnt, 
	smp_wmb(); 

	sn->rpcb_users = 1;

	dprintk("RPC:       created new rpcb local clients (rpcb_local_clnt: "

			"%p, rpcb_local_clnt4: %p) for net %p%s\n",

		"%p, rpcb_local_clnt4: %p) for net %x%s\n",

		sn->rpcb_local_clnt, sn->rpcb_local_clnt4,

			net, (net == &init_net) ? " (init_net)" : "");

		net->ns.inum, (net == &init_net) ? " (init_net)" : "");

}



/*