From: majianpeng Date: Tue, 22 May 2012 03:55:03 +0000 (+1000) Subject: md/raid10: Fix memleak in r10buf_pool_alloc X-Git-Tag: upstream/snapshot3+hdmi~7404^2~34 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5fdd2cf8265c6de0f190dea80cc4c50da8f31293;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git 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 Signed-off-by: NeilBrown --- diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c index ec271ae..fb9062b 100644 --- a/drivers/md/raid10.c +++ b/drivers/md/raid10.c @@ -173,10 +173,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); }