[<prev] [next>] [day] [month] [year] [list]
Message-Id: <1403779012-12350-1-git-send-email-luis.henriques@canonical.com>
Date: Thu, 26 Jun 2014 11:36:52 +0100
From: Luis Henriques <luis.henriques@...onical.com>
To: Mateusz Guzik <mguzik@...hat.com>
Cc: linux-nfs@...r.kernel.org, linux-kernel@...r.kernel.org,
Trond Myklebust <trond.myklebust@...marydata.com>,
Luis Henriques <luis.henriques@...onical.com>,
kernel-team@...ts.ubuntu.com
Subject: [3.11.y.z extended stable] Patch "NFS: populate ->net in mount data when remounting" has been added to staging queue
This is a note to let you know that I have just added a patch titled
NFS: populate ->net in mount data when remounting
to the linux-3.11.y-queue branch of the 3.11.y.z extended stable tree
which can be found at:
http://kernel.ubuntu.com/git?p=ubuntu/linux.git;a=shortlog;h=refs/heads/linux-3.11.y-queue
If you, or anyone else, feels it should not be added to this tree, please
reply to this email.
For more information about the 3.11.y.z tree, see
https://wiki.ubuntu.com/Kernel/Dev/ExtendedStable
Thanks.
-Luis
------
>From a544eeb67d3723b24eed458549e60cfa9221c7df Mon Sep 17 00:00:00 2001
From: Mateusz Guzik <mguzik@...hat.com>
Date: Tue, 10 Jun 2014 12:44:12 +0200
Subject: NFS: populate ->net in mount data when remounting
commit a914722f333b3359d2f4f12919380a334176bb89 upstream.
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@...hat.com>
Cc: linux-nfs@...r.kernel.org
Cc: linux-kernel@...r.kernel.org
Signed-off-by: Trond Myklebust <trond.myklebust@...marydata.com>
[ luis: backported to 3.11: adjusted context ]
Signed-off-by: Luis Henriques <luis.henriques@...onical.com>
---
fs/nfs/super.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/fs/nfs/super.c b/fs/nfs/super.c
index f6db66d8f647..928bb8c1680e 100644
--- a/fs/nfs/super.c
+++ b/fs/nfs/super.c
@@ -2178,6 +2178,7 @@ nfs_remount(struct super_block *sb, int *flags, char *raw_data)
data->timeo = 10U * nfss->client->cl_timeout->to_initval / HZ;
data->nfs_server.port = nfss->port;
data->nfs_server.addrlen = nfss->nfs_client->cl_addrlen;
+ data->net = current->nsproxy->net_ns;
memcpy(&data->nfs_server.address, &nfss->nfs_client->cl_addr,
data->nfs_server.addrlen);
--
1.9.1
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists