From: Gu Zheng <guz.fnst@cn.fujitsu.com>
To: Al Viro <viro@zeniv.linux.org.uk>
Cc: linux-fsdevel <linux-fsdevel@vger.kernel.org>,
linux-kernel <linux-kernel@vger.kernel.org>,
Jens <axboe@kernel.dk>, Kent <kmo@daterainc.com>,
Andrew Morton <akpm@linux-foundation.org>
Subject: Re: [PATCH RESEND] fs/bio-integrity: fix a potential mem leak
Date: Wed, 31 Jul 2013 18:02:39 +0800 [thread overview]
Message-ID: <51F8E0BF.3040606@cn.fujitsu.com> (raw)
In-Reply-To: <51F5CA11.4050401@cn.fujitsu.com>
cc akpm
On 07/29/2013 09:49 AM, Gu Zheng wrote:
> 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>
> ---
> fs/bio-integrity.c | 9 +++++----
> 1 files changed, 5 insertions(+), 4 deletions(-)
>
> diff --git a/fs/bio-integrity.c b/fs/bio-integrity.c
> index 8fb4291..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;
> }
prev parent reply other threads:[~2013-07-31 10:06 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-07-29 1:49 [PATCH RESEND] fs/bio-integrity: fix a potential mem leak Gu Zheng
2013-07-31 10:02 ` Gu Zheng [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=51F8E0BF.3040606@cn.fujitsu.com \
--to=guz.fnst@cn.fujitsu.com \
--cc=akpm@linux-foundation.org \
--cc=axboe@kernel.dk \
--cc=kmo@daterainc.com \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=viro@zeniv.linux.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox