From: Bryan Schumaker <bjschuma@netapp.com> To: Jiri Slaby <jslaby@suse.cz> Cc: "Myklebust, Trond" <Trond.Myklebust@netapp.com>, linux-kernel@vger.kernel.org, akpm@linux-foundation.org, mm-commits@vger.kernel.org, ML netdev <netdev@vger.kernel.org>, linux-nfs@vger.kernel.org, Jiri Slaby <jirislaby@gmail.com> Subject: [PATCH] NFS: Fix infinite loop in gss_create_upcall() Date: Tue, 12 Apr 2011 13:41:04 -0400 [thread overview] Message-ID: <4DA48EB0.40600@netapp.com> (raw) In-Reply-To: <4DA36DB6.8060108@suse.cz> On 04/11/2011 05:08 PM, Jiri Slaby wrote: > > Sorry for an extra message. I've just found out that there appears > messages in dmesg: > [ 58.656048] RPC: AUTH_GSS upcall timed out. > [ 58.656050] Please check user daemon is running. > [ 88.656065] RPC: AUTH_GSS upcall timed out. > [ 88.656068] Please check user daemon is running. > [ 118.656077] RPC: AUTH_GSS upcall timed out. > [ 118.656080] Please check user daemon is running. > [ 148.656049] RPC: AUTH_GSS upcall timed out. > [ 148.656052] Please check user daemon is running. > [ 178.656046] RPC: AUTH_GSS upcall timed out. > [ 178.656049] Please check user daemon is running. > > > I instrumented the code and it's stuck with trying RPC_AUTH_GSS_KRB5. > > I don't use GSS at all. > > regards, Does this patch help? - Bryan 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> -- 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); diff --git a/net/sunrpc/auth_gss/auth_gss.c b/net/sunrpc/auth_gss/auth_gss.c index f3914d0..339ba64 100644 --- a/net/sunrpc/auth_gss/auth_gss.c +++ b/net/sunrpc/auth_gss/auth_gss.c @@ -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 @@ retry: 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)) {
WARNING: multiple messages have this Message-ID (diff)
From: Bryan Schumaker <bjschuma-HgOvQuBEEgTQT0dZR+AlfA@public.gmane.org> To: Jiri Slaby <jslaby-AlSwsSmVLrQ@public.gmane.org> Cc: "Myklebust, Trond" <Trond.Myklebust-HgOvQuBEEgTQT0dZR+AlfA@public.gmane.org>, linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, akpm-de/tnXTf+JLsfHDXvbKv3WD2FQJk+8+b@public.gmane.org, mm-commits-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, ML netdev <netdev-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>, linux-nfs-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, Jiri Slaby <jirislaby-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> Subject: [PATCH] NFS: Fix infinite loop in gss_create_upcall() Date: Tue, 12 Apr 2011 13:41:04 -0400 [thread overview] Message-ID: <4DA48EB0.40600@netapp.com> (raw) In-Reply-To: <4DA36DB6.8060108-AlSwsSmVLrQ@public.gmane.org> On 04/11/2011 05:08 PM, Jiri Slaby wrote: > > Sorry for an extra message. I've just found out that there appears > messages in dmesg: > [ 58.656048] RPC: AUTH_GSS upcall timed out. > [ 58.656050] Please check user daemon is running. > [ 88.656065] RPC: AUTH_GSS upcall timed out. > [ 88.656068] Please check user daemon is running. > [ 118.656077] RPC: AUTH_GSS upcall timed out. > [ 118.656080] Please check user daemon is running. > [ 148.656049] RPC: AUTH_GSS upcall timed out. > [ 148.656052] Please check user daemon is running. > [ 178.656046] RPC: AUTH_GSS upcall timed out. > [ 178.656049] Please check user daemon is running. > > > I instrumented the code and it's stuck with trying RPC_AUTH_GSS_KRB5. > > I don't use GSS at all. > > regards, Does this patch help? - Bryan 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-HgOvQuBEEgTQT0dZR+AlfA@public.gmane.org> -- 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); diff --git a/net/sunrpc/auth_gss/auth_gss.c b/net/sunrpc/auth_gss/auth_gss.c index f3914d0..339ba64 100644 --- a/net/sunrpc/auth_gss/auth_gss.c +++ b/net/sunrpc/auth_gss/auth_gss.c @@ -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 @@ retry: 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)) { -- To unsubscribe from this list: send the line "unsubscribe linux-nfs" in the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org More majordomo info at http://vger.kernel.org/majordomo-info.html
next prev parent reply other threads:[~2011-04-12 17:41 UTC|newest] Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top 2011-03-31 21:48 mmotm 2011-03-31-14-48 uploaded akpm 2011-03-31 21:48 ` akpm 2011-04-01 15:56 ` [PATCH -mm] olpc: xo_1 needs delay.h Randy Dunlap 2011-04-01 15:57 ` [PATCH -mm] leds: fix pca9532 build when GPIOLIB is disabled Randy Dunlap 2011-04-02 8:56 ` nfs client doesn't work [was: mmotm 2011-03-31-14-48 uploaded] Jiri Slaby 2011-04-02 8:56 ` Jiri Slaby [not found] ` <1302122693.16786.0.camel@lade.trondhjem.org> 2011-04-07 6:42 ` Jiri Slaby 2011-04-07 6:42 ` Jiri Slaby 2011-04-11 20:40 ` Jiri Slaby 2011-04-11 20:40 ` Jiri Slaby 2011-04-11 20:40 ` Jiri Slaby 2011-04-11 20:40 ` Jiri Slaby 2011-04-11 21:08 ` Jiri Slaby 2011-04-11 21:08 ` Jiri Slaby 2011-04-12 17:41 ` Bryan Schumaker [this message] 2011-04-12 17:41 ` [PATCH] NFS: Fix infinite loop in gss_create_upcall() Bryan Schumaker 2011-04-12 18:05 ` Jiri Slaby 2011-04-12 18:05 ` Jiri Slaby 2011-04-12 18:31 ` Trond Myklebust 2011-04-12 18:34 ` Jiri Slaby 2011-04-12 18:34 ` Jiri Slaby 2011-04-12 18:38 ` Trond Myklebust 2011-04-12 18:38 ` Trond Myklebust 2011-04-12 18:43 ` Bryan Schumaker 2011-04-12 18:43 ` Bryan Schumaker 2011-04-12 18:52 ` Jiri Slaby 2011-04-12 18:52 ` Jiri Slaby 2011-04-13 20:42 ` Bryan Schumaker 2011-04-13 20:42 ` Bryan Schumaker 2011-04-14 20:37 ` Jiri Slaby 2011-04-14 20:37 ` Jiri Slaby 2011-04-14 21:21 ` Trond Myklebust 2011-04-14 21:30 ` Jiri Slaby 2011-04-14 21:30 ` Jiri Slaby 2011-04-11 20:56 ` nfs client doesn't work [was: mmotm 2011-03-31-14-48 uploaded] Bryan Schumaker 2011-04-11 20:56 ` Bryan Schumaker 2011-04-11 21:19 ` Jiri Slaby 2011-04-03 9:11 ` mmotm 2011-03-31-14-48 uploaded KOSAKI Motohiro 2011-04-04 20:46 ` Peter Zijlstra 2011-04-04 20:46 ` Peter Zijlstra 2011-04-05 5:23 ` KOSAKI Motohiro 2011-04-11 4:11 ` KOSAKI Motohiro 2011-04-11 4:11 ` KOSAKI Motohiro 2011-04-11 4:11 ` KOSAKI Motohiro
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=4DA48EB0.40600@netapp.com \ --to=bjschuma@netapp.com \ --cc=Trond.Myklebust@netapp.com \ --cc=akpm@linux-foundation.org \ --cc=jirislaby@gmail.com \ --cc=jslaby@suse.cz \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-nfs@vger.kernel.org \ --cc=mm-commits@vger.kernel.org \ --cc=netdev@vger.kernel.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.