[PATCH] md/raid10:Memleak fix if allocate rep1_bio failed in function want_replacement().

[PATCH] md/raid10:Memleak fix if allocate rep1_bio failed in function want_replacement().

[majianpeng]

From cb391c87d24a32b211d9f0a9df942987bf8e0ac4 Mon Sep 17 00:00:00 2001
From: majianpeng <majianpeng@gmail.com>
Date: Mon, 16 Apr 2012 19:19:53 +0800
Subject: [PATCH] md/raid10:Memleak fix if allocate rep1_bio failed in
 function want_replacement().
 Reported by kmemleak.

Signed-off-by: majianpeng <majianpeng@gmail.com>
---
 drivers/md/raid10.c |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c
index c8dbb84..19e9af1 100644
--- a/drivers/md/raid10.c
+++ b/drivers/md/raid10.c
@@ -165,10 +165,11 @@ out_free_pages:
 	while (j--)
 		for (i = 0; i < RESYNC_PAGES ; i++)
 			safe_put_page(r10_bio->devs[j].bio->bi_io_vec[i].bv_page);
-	j = -1;
+	j = 0;
 out_free_bio:
-	while (++j < nalloc) {
-		bio_put(r10_bio->devs[j].bio);
+	for ( ; j < nalloc; j++) {
+		if (r10_bio->devs[j].bio)
+			bio_put(r10_bio->devs[j].bio);
 		if (r10_bio->devs[j].repl_bio)
 			bio_put(r10_bio->devs[j].repl_bio);
 	}
-- 
1.7.5.4

 				
--------------
majianpeng
2012-04-16

Re: [PATCH] md/raid10:Memleak fix if allocate rep1_bio failed in function want_replacement().

[NeilBrown]

[-- Attachment #1: Type: text/plain, Size: 1670 bytes --]

On Mon, 16 Apr 2012 19:24:13 +0800 "majianpeng" <majianpeng@gmail.com> wrote:

> >From cb391c87d24a32b211d9f0a9df942987bf8e0ac4 Mon Sep 17 00:00:00 2001
> From: majianpeng <majianpeng@gmail.com>
> Date: Mon, 16 Apr 2012 19:19:53 +0800
> Subject: [PATCH] md/raid10:Memleak fix if allocate rep1_bio failed in
>  function want_replacement().
>  Reported by kmemleak.

Please try to make the description a bit easier to read.
The first line should be a brief summary of the problem or fix.

Details come afterwards.

I have change it to the following and applied.

Thanks,
NeilBrown

    md/raid10: Fix memleak in r10buf_pool_alloc
    
    If the allocation of rep1_bio fails, we currently don't free the 'bio'
    of the same dev.
    
    Reported by kmemleak.
    
    Signed-off-by: majianpeng <majianpeng@gmail.com>
    Signed-off-by: NeilBrown <neilb@suse.de>



> 
> Signed-off-by: majianpeng <majianpeng@gmail.com>
> ---
>  drivers/md/raid10.c |    7 ++++---
>  1 files changed, 4 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c
> index c8dbb84..19e9af1 100644
> --- a/drivers/md/raid10.c
> +++ b/drivers/md/raid10.c
> @@ -165,10 +165,11 @@ out_free_pages:
>  	while (j--)
>  		for (i = 0; i < RESYNC_PAGES ; i++)
>  			safe_put_page(r10_bio->devs[j].bio->bi_io_vec[i].bv_page);
> -	j = -1;
> +	j = 0;
>  out_free_bio:
> -	while (++j < nalloc) {
> -		bio_put(r10_bio->devs[j].bio);
> +	for ( ; j < nalloc; j++) {
> +		if (r10_bio->devs[j].bio)
> +			bio_put(r10_bio->devs[j].bio);
>  		if (r10_bio->devs[j].repl_bio)
>  			bio_put(r10_bio->devs[j].repl_bio);
>  	}


[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 828 bytes --]