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>

diff --git a/fs/nfs/nfs4namespace.c b/fs/nfs/nfs4namespace.c
index 3d5dbf80d46a8c844bf7fd96c6db6935bb76d48b..1b86fef0b82822dad1dab8dda60a4520f4cb472b 100644 (file)
--- 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: