public inbox for linux-nfs@vger.kernel.org
 help / color / mirror / Atom feed
* [patch 2/2] sunrpc/cache: fix module refcnt leak in a failure path
@ 2010-03-11 22:08 akpm
       [not found] ` <201003112208.o2BM8Bng013520-AB4EexQrvXRQetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org>
  0 siblings, 1 reply; 2+ messages in thread
From: akpm @ 2010-03-11 22:08 UTC (permalink / raw)
  To: trond.myklebust; +Cc: linux-nfs, akpm, lizf, Trond.Myklebust, bfields, neilb

From: Li Zefan <lizf@cn.fujitsu.com>

Don't forget to release the module refcnt if seq_open() returns failure.

Signed-off-by: Li Zefan <lizf@cn.fujitsu.com>
Cc: J. Bruce Fields <bfields@fieldses.org>
Cc: Neil Brown <neilb@suse.de>
Cc: Trond Myklebust <Trond.Myklebust@netapp.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 net/sunrpc/cache.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff -puN net/sunrpc/cache.c~sunrpc-cache-fix-module-refcnt-leak-in-a-failure-path net/sunrpc/cache.c
--- a/net/sunrpc/cache.c~sunrpc-cache-fix-module-refcnt-leak-in-a-failure-path
+++ a/net/sunrpc/cache.c
@@ -1233,8 +1233,10 @@ static int content_open(struct inode *in
 	if (!cd || !try_module_get(cd->owner))
 		return -EACCES;
 	han = __seq_open_private(file, &cache_content_op, sizeof(*han));
-	if (han == NULL)
+	if (han == NULL) {
+		module_put(cd->owner);
 		return -ENOMEM;
+	}
 
 	han->cd = cd;
 	return 0;
_

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

* Re: [patch 2/2] sunrpc/cache: fix module refcnt leak in a failure path
       [not found] ` <201003112208.o2BM8Bng013520-AB4EexQrvXRQetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org>
@ 2010-03-24 14:43   ` J. Bruce Fields
  0 siblings, 0 replies; 2+ messages in thread
From: J. Bruce Fields @ 2010-03-24 14:43 UTC (permalink / raw)
  To: akpm; +Cc: trond.myklebust, linux-nfs, lizf, Trond.Myklebust, neilb

On Thu, Mar 11, 2010 at 02:08:10PM -0800, akpm@linux-foundation.org wrote:
> From: Li Zefan <lizf@cn.fujitsu.com>
> 
> Don't forget to release the module refcnt if seq_open() returns failure.

Thanks, applied for 2.6.35.--b.

> 
> Signed-off-by: Li Zefan <lizf@cn.fujitsu.com>
> Cc: J. Bruce Fields <bfields@fieldses.org>
> Cc: Neil Brown <neilb@suse.de>
> Cc: Trond Myklebust <Trond.Myklebust@netapp.com>
> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
> ---
> 
>  net/sunrpc/cache.c |    4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff -puN net/sunrpc/cache.c~sunrpc-cache-fix-module-refcnt-leak-in-a-failure-path net/sunrpc/cache.c
> --- a/net/sunrpc/cache.c~sunrpc-cache-fix-module-refcnt-leak-in-a-failure-path
> +++ a/net/sunrpc/cache.c
> @@ -1233,8 +1233,10 @@ static int content_open(struct inode *in
>  	if (!cd || !try_module_get(cd->owner))
>  		return -EACCES;
>  	han = __seq_open_private(file, &cache_content_op, sizeof(*han));
> -	if (han == NULL)
> +	if (han == NULL) {
> +		module_put(cd->owner);
>  		return -ENOMEM;
> +	}
>  
>  	han->cd = cd;
>  	return 0;
> _

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

end of thread, other threads:[~2010-03-24 14:41 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-03-11 22:08 [patch 2/2] sunrpc/cache: fix module refcnt leak in a failure path akpm
     [not found] ` <201003112208.o2BM8Bng013520-AB4EexQrvXRQetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org>
2010-03-24 14:43   ` J. Bruce Fields

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox