From: David Sterba <dsterba@suse.cz>
To: Jia-Ju Bai <baijiaju1990@gmail.com>
Cc: clm@fb.com, josef@toxicpanda.com, dsterba@suse.com,
linux-btrfs@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH] fs: btrfs: fix possible use-after-free bug in error handling code of btrfs_get_root_ref()
Date: Thu, 24 Mar 2022 19:19:40 +0100 [thread overview]
Message-ID: <20220324181940.GK2237@suse.cz> (raw)
In-Reply-To: <20220324134454.15192-1-baijiaju1990@gmail.com>
On Thu, Mar 24, 2022 at 06:44:54AM -0700, Jia-Ju Bai wrote:
> In btrfs_get_root_ref(), when btrfs_insert_fs_root() fails,
> btrfs_put_root() will be called to possibly free the memory area of
> the variable root. However, this variable is then used again in error
> handling code after "goto fail", when ret is not -EEXIST.
>
> To fix this possible bug, btrfs_put_root() is only called when ret is
> -EEXIST for "goto again".
>
> Reported-by: TOTE Robot <oslab@tsinghua.edu.cn>
> Signed-off-by: Jia-Ju Bai <baijiaju1990@gmail.com>
> ---
> fs/btrfs/disk-io.c | 5 +++--
> 1 file changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c
> index b30309f187cf..126f244cdf88 100644
> --- a/fs/btrfs/disk-io.c
> +++ b/fs/btrfs/disk-io.c
> @@ -1850,9 +1850,10 @@ static struct btrfs_root *btrfs_get_root_ref(struct btrfs_fs_info *fs_info,
>
> ret = btrfs_insert_fs_root(fs_info, root);
> if (ret) {
> - btrfs_put_root(root);
> - if (ret == -EEXIST)
> + if (ret == -EEXIST) {
> + btrfs_put_root(root);
I think this fix is correct, though it's not that clear. If you look how
the code changed, there was the unconditional put and then followed by a
free:
8c38938c7bb0 ("btrfs: move the root freeing stuff into btrfs_put_root")
Here it's putting twice where one will be the final free.
And then the whole refcounting gets updated in
4785e24fa5d2 ("btrfs: don't take an extra root ref at allocation time")
which could be removing the wrong put, I'm not yet sure.
next prev parent reply other threads:[~2022-03-24 18:23 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-24 13:44 [PATCH] fs: btrfs: fix possible use-after-free bug in error handling code of btrfs_get_root_ref() Jia-Ju Bai
2022-03-24 18:19 ` David Sterba [this message]
2022-03-25 8:04 ` Jia-Ju Bai
2022-04-01 15:54 ` David Sterba
2023-08-23 8:00 ` Lee Jones
2023-08-23 8:07 ` Lee Jones
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=20220324181940.GK2237@suse.cz \
--to=dsterba@suse.cz \
--cc=baijiaju1990@gmail.com \
--cc=clm@fb.com \
--cc=dsterba@suse.com \
--cc=josef@toxicpanda.com \
--cc=linux-btrfs@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
/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