Commit dee972b9 authored by Trond Myklebust's avatar Trond Myklebust

NFS: Fix error reporting in nfs_xdev_mount

Currently, nfs_xdev_mount converts all errors from clone_server() to
ENOMEM, which can then leak to userspace (for instance to 'mount'). Fix that.
Also ensure that if nfs_fs_mount_common() returns an error, we
don't dprintk(0)...

The regression originated in commit 3d176e3f
(NFS: Use nfs_fs_mount_common() for xdev mounts)
Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
Cc: stable@vger.kernel.org [>= 3.5]
parent 949db153
...@@ -2589,27 +2589,23 @@ nfs_xdev_mount(struct file_system_type *fs_type, int flags, ...@@ -2589,27 +2589,23 @@ nfs_xdev_mount(struct file_system_type *fs_type, int flags,
struct nfs_server *server; struct nfs_server *server;
struct dentry *mntroot = ERR_PTR(-ENOMEM); struct dentry *mntroot = ERR_PTR(-ENOMEM);
struct nfs_subversion *nfs_mod = NFS_SB(data->sb)->nfs_client->cl_nfs_mod; struct nfs_subversion *nfs_mod = NFS_SB(data->sb)->nfs_client->cl_nfs_mod;
int error;
dprintk("--> nfs_xdev_mount_common()\n"); dprintk("--> nfs_xdev_mount()\n");
mount_info.mntfh = mount_info.cloned->fh; mount_info.mntfh = mount_info.cloned->fh;
/* create a new volume representation */ /* create a new volume representation */
server = nfs_mod->rpc_ops->clone_server(NFS_SB(data->sb), data->fh, data->fattr, data->authflavor); server = nfs_mod->rpc_ops->clone_server(NFS_SB(data->sb), data->fh, data->fattr, data->authflavor);
if (IS_ERR(server)) {
error = PTR_ERR(server);
goto out_err;
}
mntroot = nfs_fs_mount_common(server, flags, dev_name, &mount_info, nfs_mod); if (IS_ERR(server))
dprintk("<-- nfs_xdev_mount_common() = 0\n"); mntroot = ERR_CAST(server);
out: else
return mntroot; mntroot = nfs_fs_mount_common(server, flags,
dev_name, &mount_info, nfs_mod);
out_err: dprintk("<-- nfs_xdev_mount() = %ld\n",
dprintk("<-- nfs_xdev_mount_common() = %d [error]\n", error); IS_ERR(mntroot) ? PTR_ERR(mntroot) : 0L);
goto out; return mntroot;
} }
#if IS_ENABLED(CONFIG_NFS_V4) #if IS_ENABLED(CONFIG_NFS_V4)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment