Subject: + fs-bio-integrity-fix-a-potential-mem-leak.patch added to -mm tree To: guz.fnst@xxxxxxxxxxxxxx From: akpm@xxxxxxxxxxxxxxxxxxxx Date: Thu, 08 Aug 2013 12:52:59 -0700 The patch titled Subject: fs/bio-integrity: fix a potential mem leak has been added to the -mm tree. Its filename is fs-bio-integrity-fix-a-potential-mem-leak.patch This patch should soon appear at http://ozlabs.org/~akpm/mmots/broken-out/fs-bio-integrity-fix-a-potential-mem-leak.patch and later at http://ozlabs.org/~akpm/mmotm/broken-out/fs-bio-integrity-fix-a-potential-mem-leak.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** The -mm tree is included into linux-next and is updated there every 3-4 working days ------------------------------------------------------ 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 fs-bio-integrity-fix-a-potential-mem-leak.patch lib-crc32-update-the-comments-of-crc32_bele_generic.patch lib-crc32-update-the-comments-of-crc32_bele_generic-checkpatch-fixes.patch linux-next.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