diff options
Diffstat (limited to 'fs/nfsd/nfsctl.c')
| -rw-r--r-- | fs/nfsd/nfsctl.c | 6 | 
1 files changed, 5 insertions, 1 deletions
diff --git a/fs/nfsd/nfsctl.c b/fs/nfsd/nfsctl.c index 7f555179bf8..51844048937 100644 --- a/fs/nfsd/nfsctl.c +++ b/fs/nfsd/nfsctl.c @@ -699,6 +699,11 @@ static ssize_t __write_ports_addfd(char *buf, struct net *net)  	if (err != 0 || fd < 0)  		return -EINVAL; +	if (svc_alien_sock(net, fd)) { +		printk(KERN_ERR "%s: socket net is different to NFSd's one\n", __func__); +		return -EINVAL; +	} +  	err = nfsd_create_serv(net);  	if (err != 0)  		return err; @@ -1174,7 +1179,6 @@ static int __init init_nfsd(void)  	retval = nfsd4_init_slabs();  	if (retval)  		goto out_unregister_pernet; -	nfs4_state_init();  	retval = nfsd_fault_inject_init(); /* nfsd fault injection controls */  	if (retval)  		goto out_free_slabs;  | 
