summaryrefslogtreecommitdiff
path: root/fs/nfs
diff options
context:
space:
mode:
authorAndy Adamson <andros@netapp.com>2014-06-09 23:33:19 +0400
committerTrond Myklebust <trond.myklebust@primarydata.com>2014-06-25 02:46:57 +0400
commit57bbe3d7c110fcc20a661cb814a401e4126ca590 (patch)
tree649a416fd687f3340a5b4b59edcf088b3874113b /fs/nfs
parent6edf96097b1df34fcd332f7ee4ba120fbc1d16c3 (diff)
downloadlinux-57bbe3d7c110fcc20a661cb814a401e4126ca590.tar.xz
NFS check the return of nfs4_negotiate_security in nfs4_submount
Signed-off-by: Andy Adamson <andros@netapp.com> Tested-By: Steve Dickson <steved@redhat.com> Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
Diffstat (limited to 'fs/nfs')
-rw-r--r--fs/nfs/nfs4namespace.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/fs/nfs/nfs4namespace.c b/fs/nfs/nfs4namespace.c
index 3d5dbf80d46a..1b86fef0b828 100644
--- a/fs/nfs/nfs4namespace.c
+++ b/fs/nfs/nfs4namespace.c
@@ -399,8 +399,11 @@ struct vfsmount *nfs4_submount(struct nfs_server *server, struct dentry *dentry,
flavor = client->cl_auth->au_flavor;
else {
rpc_authflavor_t new = nfs4_negotiate_security(dir, name);
- if ((int)new >= 0)
- flavor = new;
+ if ((int)new < 0) {
+ mnt = ERR_PTR((int)new);
+ goto out;
+ }
+ flavor = new;
}
mnt = nfs_do_submount(dentry, fh, fattr, flavor);
out: