mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-04 09:59:32 +00:00
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>
This commit is contained in:
parent
79a48a1f5d
commit
d1a8016a2d
2 changed files with 8 additions and 5 deletions
|
@ -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);
|
||||
|
|
|
@ -520,7 +520,7 @@ gss_refresh_upcall(struct rpc_task *task)
|
|||
warn_gssd();
|
||||
task->tk_timeout = 15*HZ;
|
||||
rpc_sleep_on(&pipe_version_rpc_waitqueue, task, NULL);
|
||||
return 0;
|
||||
return -EAGAIN;
|
||||
}
|
||||
if (IS_ERR(gss_msg)) {
|
||||
err = PTR_ERR(gss_msg);
|
||||
|
@ -563,10 +563,12 @@ gss_create_upcall(struct gss_auth *gss_auth, struct gss_cred *gss_cred)
|
|||
if (PTR_ERR(gss_msg) == -EAGAIN) {
|
||||
err = wait_event_interruptible_timeout(pipe_version_waitqueue,
|
||||
pipe_version >= 0, 15*HZ);
|
||||
if (pipe_version < 0) {
|
||||
warn_gssd();
|
||||
err = -EACCES;
|
||||
}
|
||||
if (err)
|
||||
goto out;
|
||||
if (pipe_version < 0)
|
||||
warn_gssd();
|
||||
goto retry;
|
||||
}
|
||||
if (IS_ERR(gss_msg)) {
|
||||
|
|
Loading…
Reference in a new issue