From: Filipe Manana <fdmanana@gmail.com>
To: Dinghao Liu <dinghao.liu@zju.edu.cn>
Cc: kjlu@umn.edu, pakki001@umn.edu, Chris Mason <clm@fb.com>,
Josef Bacik <josef@toxicpanda.com>,
David Sterba <dsterba@suse.com>,
linux-btrfs <linux-btrfs@vger.kernel.org>,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH] fs: Fix a missing check bug
Date: Sat, 7 Dec 2019 17:16:10 +0000 [thread overview]
Message-ID: <CAL3q7H48ObWGwY=C=L45CKkC4D1nLUr0s3_YUwHPSCmirKmidA@mail.gmail.com> (raw)
In-Reply-To: <20191207144126.14320-1-dinghao.liu@zju.edu.cn>
On Sat, Dec 7, 2019 at 3:03 PM Dinghao Liu <dinghao.liu@zju.edu.cn> wrote:
>
> The return value of link_free_space(ctl, info) is checked out-sync. Only one branch of an if statement checks this return value after WARN_ON(ret).
>
> Since this path pair is similar in semantic, there might be a missing check bug.
>
> Fix this by simply adding a check on ret.
>
> Signed-off-by: Dinghao Liu <dinghao.liu@zju.edu.cn>
> ---
> fs/btrfs/free-space-cache.c | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/fs/btrfs/free-space-cache.c b/fs/btrfs/free-space-cache.c
> index 3283da419200..acbb3a59d344 100644
> --- a/fs/btrfs/free-space-cache.c
> +++ b/fs/btrfs/free-space-cache.c
> @@ -2437,6 +2437,8 @@ int btrfs_remove_free_space(struct btrfs_block_group *block_group,
> if (info->bytes) {
> ret = link_free_space(ctl, info);
> WARN_ON(ret);
> + if (ret)
I think the WARN_ON() can go away as well.
The only possible error is -EEXIST, coming from tree_insert_offset().
When that happens tree_insert_offset() already emits a warning.
Also, the free space entry needs to be freed, otherwise we leak
memory. So it should be something like this:
if (ret) {
kmem_cache_free(btrfs_free_space_cachep, info);
goto out_unlock;
}
Further the subject should be prefixed with "btrfs: " and not "fs: ",
since this is a btrfs specific patch.
Something like the following for example:
"btrfs: add missing error handling when removing free space"
Thanks.
> + goto out_lock;
> } else {
> kmem_cache_free(btrfs_free_space_cachep, info);
> }
> --
> 2.21.0 (Apple Git-122)
>
--
Filipe David Manana,
“Whether you think you can, or you think you can't — you're right.”
next prev parent reply other threads:[~2019-12-07 17:16 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-07 14:41 [PATCH] fs: Fix a missing check bug Dinghao Liu
2019-12-07 17:16 ` Filipe Manana [this message]
2019-12-08 5:02 ` Qu Wenruo
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='CAL3q7H48ObWGwY=C=L45CKkC4D1nLUr0s3_YUwHPSCmirKmidA@mail.gmail.com' \
--to=fdmanana@gmail.com \
--cc=clm@fb.com \
--cc=dinghao.liu@zju.edu.cn \
--cc=dsterba@suse.com \
--cc=josef@toxicpanda.com \
--cc=kjlu@umn.edu \
--cc=linux-btrfs@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=pakki001@umn.edu \
/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;
as well as URLs for NNTP newsgroup(s).