[patch 2/2] sunrpc/cache: fix module refcnt leak in a failure path

[patch 2/2] sunrpc/cache: fix module refcnt leak in a failure path

[akpm]

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;
_

Re: [patch 2/2] sunrpc/cache: fix module refcnt leak in a failure path

[J. Bruce Fields]

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;
> _