diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2013-05-15 10:46:33 -0700 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2013-05-15 10:49:58 -0700 |
| commit | d36ccb9cec22a09a12d9ef8234d634f840d7ae4b (patch) | |
| tree | 98c0a98a69aa2c7cf8ba99c92b0de8594da9b385 | |
| parent | f722406faae2d073cc1d01063d1123c35425939e (diff) | |
| download | op-kernel-dev-d36ccb9cec22a09a12d9ef8234d634f840d7ae4b.zip op-kernel-dev-d36ccb9cec22a09a12d9ef8234d634f840d7ae4b.tar.gz | |
SUNRPC: Fix a bug in gss_create_upcall
If wait_event_interruptible_timeout() is successful, it returns
the number of seconds remaining until the timeout. In that
case, we should be retrying the upcall.
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
| -rw-r--r-- | net/sunrpc/auth_gss/auth_gss.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/net/sunrpc/auth_gss/auth_gss.c b/net/sunrpc/auth_gss/auth_gss.c index 7da6b45..f17f3c5 100644 --- a/net/sunrpc/auth_gss/auth_gss.c +++ b/net/sunrpc/auth_gss/auth_gss.c @@ -563,11 +563,12 @@ gss_create_upcall(struct gss_auth *gss_auth, struct gss_cred *gss_cred) struct rpc_cred *cred = &gss_cred->gc_base; struct gss_upcall_msg *gss_msg; DEFINE_WAIT(wait); - int err = 0; + int err; dprintk("RPC: %s for uid %u\n", __func__, from_kuid(&init_user_ns, cred->cr_uid)); retry: + err = 0; gss_msg = gss_setup_upcall(gss_auth->client, gss_auth, cred); if (PTR_ERR(gss_msg) == -EAGAIN) { err = wait_event_interruptible_timeout(pipe_version_waitqueue, @@ -576,7 +577,7 @@ retry: warn_gssd(); err = -EACCES; } - if (err) + if (err < 0) goto out; goto retry; } |
