Subject: [merged] fs-bio-integrity-fix-a-potential-mem-leak.patch removed from -mm tree To: guz.fnst@xxxxxxxxxxxxxx,mm-commits@xxxxxxxxxxxxxxx From: akpm@xxxxxxxxxxxxxxxxxxxx Date: Thu, 12 Sep 2013 12:46:11 -0700 The patch titled Subject: fs/bio-integrity: fix a potential mem leak has been removed from the -mm tree. Its filename was fs-bio-integrity-fix-a-potential-mem-leak.patch This patch was dropped because it was merged into mainline or a subsystem tree ------------------------------------------------------ From: Gu Zheng <guz.fnst@xxxxxxxxxxxxxx> Subject: fs/bio-integrity: fix a potential mem leak Free the bio_integrity_pool in the fail path of biovec_create_pool in function bioset_integrity_create(). Signed-off-by: Gu Zheng <guz.fnst@xxxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- fs/bio-integrity.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff -puN fs/bio-integrity.c~fs-bio-integrity-fix-a-potential-mem-leak fs/bio-integrity.c --- a/fs/bio-integrity.c~fs-bio-integrity-fix-a-potential-mem-leak +++ a/fs/bio-integrity.c @@ -716,13 +716,14 @@ int bioset_integrity_create(struct bio_s return 0; bs->bio_integrity_pool = mempool_create_slab_pool(pool_size, bip_slab); - - bs->bvec_integrity_pool = biovec_create_pool(bs, pool_size); - if (!bs->bvec_integrity_pool) + if (!bs->bio_integrity_pool) return -1; - if (!bs->bio_integrity_pool) + bs->bvec_integrity_pool = biovec_create_pool(bs, pool_size); + if (!bs->bvec_integrity_pool) { + mempool_destroy(bs->bio_integrity_pool); return -1; + } return 0; } _ Patches currently in -mm which might be from guz.fnst@xxxxxxxxxxxxxx are origin.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html