NFS: populate ->net in mount data when remounting
authorMateusz Guzik <mguzik@redhat.com>
Tue, 10 Jun 2014 10:44:12 +0000 (12:44 +0200)
committerTrond Myklebust <trond.myklebust@primarydata.com>
Tue, 10 Jun 2014 15:10:29 +0000 (11:10 -0400)
Otherwise the kernel oopses when remounting with IPv6 server because
net is dereferenced in dev_get_by_name.

Use net ns of current thread so that dev_get_by_name does not operate on
foreign ns. Changing the address is prohibited anyway so this should not
affect anything.

Signed-off-by: Mateusz Guzik <mguzik@redhat.com>
Cc: linux-nfs@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Cc: stable@vger.kernel.org # 3.4+
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
fs/nfs/super.c

index 1a6d7ac9d9d2abdab1d042a67904d9ffeefc26f4..084af1060d79e1b289f6989dd251eeab2e59f7f6 100644 (file)
@@ -2260,6 +2260,7 @@ nfs_remount(struct super_block *sb, int *flags, char *raw_data)
        data->nfs_server.addrlen = nfss->nfs_client->cl_addrlen;
        data->version = nfsvers;
        data->minorversion = nfss->nfs_client->cl_minorversion;
+       data->net = current->nsproxy->net_ns;
        memcpy(&data->nfs_server.address, &nfss->nfs_client->cl_addr,
                data->nfs_server.addrlen);