summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorStanislav Kinsbursky <skinsbursky@parallels.com>2014-02-26 16:50:01 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-05-06 07:55:29 -0700
commit344f3a6bce11dd3d483d7e36dce33b22427ff621 (patch)
tree0128cd1cca2911078ce36b29630a81c85ed8137e /include
parentb57d9c3fe362d805eb848098b7bb994a3b718ebf (diff)
downloadlinux-3.10-344f3a6bce11dd3d483d7e36dce33b22427ff621.tar.gz
linux-3.10-344f3a6bce11dd3d483d7e36dce33b22427ff621.tar.bz2
linux-3.10-344f3a6bce11dd3d483d7e36dce33b22427ff621.zip
nfsd: check passed socket's net matches NFSd superblock's one
commit 3064639423c48d6e0eb9ecc27c512a58e38c6c57 upstream. There could be a case, when NFSd file system is mounted in network, different to socket's one, like below: "ip netns exec" creates new network and mount namespace, which duplicates NFSd mount point, created in init_net context. And thus NFS server stop in nested network context leads to RPCBIND client destruction in init_net. Then, on NFSd start in nested network context, rpc.nfsd process creates socket in nested net and passes it into "write_ports", which leads to RPCBIND sockets creation in init_net context because of the same reason (NFSd monut point was created in init_net context). An attempt to register passed socket in nested net leads to panic, because no RPCBIND client present in nexted network namespace. This patch add check that passed socket's net matches NFSd superblock's one. And returns -EINVAL error to user psace otherwise. v2: Put socket on exit. Reported-by: Weng Meiling <wengmeiling.weng@huawei.com> Signed-off-by: Stanislav Kinsbursky <skinsbursky@parallels.com> Signed-off-by: J. Bruce Fields <bfields@redhat.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include')
-rw-r--r--include/linux/sunrpc/svcsock.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/sunrpc/svcsock.h b/include/linux/sunrpc/svcsock.h
index 62fd1b756e9..947009ed599 100644
--- a/include/linux/sunrpc/svcsock.h
+++ b/include/linux/sunrpc/svcsock.h
@@ -56,6 +56,7 @@ int svc_recv(struct svc_rqst *, long);
int svc_send(struct svc_rqst *);
void svc_drop(struct svc_rqst *);
void svc_sock_update_bufs(struct svc_serv *serv);
+bool svc_alien_sock(struct net *net, int fd);
int svc_addsock(struct svc_serv *serv, const int fd,
char *name_return, const size_t len);
void svc_init_xprt_sock(void);