summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorBryan Schumaker <bjschuma@netapp.com>2011-04-13 14:31:28 -0400
committerTrond Myklebust <Trond.Myklebust@netapp.com>2011-04-13 15:12:22 -0400
commitd1a8016a2d1e75021ecc8715e3c81442d7218eb6 (patch)
treeb2aaef4f3aa4566765c6e3c743c74929a7790af2 /fs
parent79a48a1f5d99ab66cf83d2d5d805e7a0e08452ed (diff)
downloadop-kernel-dev-d1a8016a2d1e75021ecc8715e3c81442d7218eb6.zip
op-kernel-dev-d1a8016a2d1e75021ecc8715e3c81442d7218eb6.tar.gz
NFS: Fix infinite loop in gss_create_upcall()
There can be an infinite loop if gss_create_upcall() is called without the userspace program running. To prevent this, we return -EACCES if we notice that pipe_version hasn't changed (indicating that the pipe has not been opened). Signed-off-by: Bryan Schumaker <bjschuma@netapp.com> Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs')
-rw-r--r--fs/nfs/nfs4proc.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
index 9bf41ea..8a03ee0 100644
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@ -2224,8 +2224,9 @@ static int nfs4_proc_get_root(struct nfs_server *server, struct nfs_fh *fhandle,
for (i = 0; i < len; i++) {
status = nfs4_lookup_root_sec(server, fhandle, info, flav_array[i]);
- if (status != -EPERM)
- break;
+ if (status == -EPERM || status == -EACCES)
+ continue;
+ break;
}
if (status == 0)
status = nfs4_server_capabilities(server, fhandle);
OpenPOWER on IntegriCloud