linux-nfs.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] SUNRPC: Fix a module reference leak in svc_handle_xprt
@ 2014-05-18 18:05 Trond Myklebust
  2014-05-22 19:57 ` Bruce Fields
  0 siblings, 1 reply; 2+ messages in thread
From: Trond Myklebust @ 2014-05-18 18:05 UTC (permalink / raw)
  To: Bruce Fields; +Cc: linux-nfs

If the accept() call fails, we need to put the module reference.

Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
---
 net/sunrpc/svc_xprt.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/net/sunrpc/svc_xprt.c b/net/sunrpc/svc_xprt.c
index 06c6ff0cb911..a4acaf2bcf18 100644
--- a/net/sunrpc/svc_xprt.c
+++ b/net/sunrpc/svc_xprt.c
@@ -730,6 +730,8 @@ static int svc_handle_xprt(struct svc_rqst *rqstp, struct svc_xprt *xprt)
 		newxpt = xprt->xpt_ops->xpo_accept(xprt);
 		if (newxpt)
 			svc_add_new_temp_xprt(serv, newxpt);
+		else
+			module_put(xprt->xpt_class->xcl_owner);
 	} else if (xprt->xpt_ops->xpo_has_wspace(xprt)) {
 		/* XPT_DATA|XPT_DEFERRED case: */
 		dprintk("svc: server %p, pool %u, transport %p, inuse=%d\n",
-- 
1.9.0


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH] SUNRPC: Fix a module reference leak in svc_handle_xprt
  2014-05-18 18:05 [PATCH] SUNRPC: Fix a module reference leak in svc_handle_xprt Trond Myklebust
@ 2014-05-22 19:57 ` Bruce Fields
  0 siblings, 0 replies; 2+ messages in thread
From: Bruce Fields @ 2014-05-22 19:57 UTC (permalink / raw)
  To: Trond Myklebust; +Cc: linux-nfs

On Sun, May 18, 2014 at 02:05:22PM -0400, Trond Myklebust wrote:
> If the accept() call fails, we need to put the module reference.

OK, applying for 3.16 and stable.

--b.

> 
> Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
> ---
>  net/sunrpc/svc_xprt.c | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/net/sunrpc/svc_xprt.c b/net/sunrpc/svc_xprt.c
> index 06c6ff0cb911..a4acaf2bcf18 100644
> --- a/net/sunrpc/svc_xprt.c
> +++ b/net/sunrpc/svc_xprt.c
> @@ -730,6 +730,8 @@ static int svc_handle_xprt(struct svc_rqst *rqstp, struct svc_xprt *xprt)
>  		newxpt = xprt->xpt_ops->xpo_accept(xprt);
>  		if (newxpt)
>  			svc_add_new_temp_xprt(serv, newxpt);
> +		else
> +			module_put(xprt->xpt_class->xcl_owner);
>  	} else if (xprt->xpt_ops->xpo_has_wspace(xprt)) {
>  		/* XPT_DATA|XPT_DEFERRED case: */
>  		dprintk("svc: server %p, pool %u, transport %p, inuse=%d\n",
> -- 
> 1.9.0
> 

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2014-05-22 19:57 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-05-18 18:05 [PATCH] SUNRPC: Fix a module reference leak in svc_handle_xprt Trond Myklebust
2014-05-22 19:57 ` Bruce Fields

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).