summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGu Zheng <guz.fnst@cn.fujitsu.com>2013-09-11 14:23:21 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2013-09-11 15:58:21 -0700
commitbc5c8f0783a4a2b43d05155782e71a22a91b26a5 (patch)
treecd972f6507e537ef5eec06cd522b5a2bfa27535d
parenta6b088875b5cfc2be95242826f31523214c083a7 (diff)
downloadop-kernel-dev-bc5c8f0783a4a2b43d05155782e71a22a91b26a5.zip
op-kernel-dev-bc5c8f0783a4a2b43d05155782e71a22a91b26a5.tar.gz
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@cn.fujitsu.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--fs/bio-integrity.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/fs/bio-integrity.c b/fs/bio-integrity.c
index 8fb42916..6025084 100644
--- a/fs/bio-integrity.c
+++ b/fs/bio-integrity.c
@@ -716,13 +716,14 @@ int bioset_integrity_create(struct bio_set *bs, int pool_size)
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;
}
OpenPOWER on IntegriCloud