Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Date:   Fri, 1 Apr 2022 17:54:56 +0200
From:   David Sterba <dsterba@suse.cz>
To:     Jia-Ju Bai <baijiaju1990@gmail.com>
Cc:     dsterba@suse.cz, 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()
Message-ID: <20220401155456.GL15609@twin.jikos.cz>
Reply-To: dsterba@suse.cz
Mail-Followup-To: dsterba@suse.cz, Jia-Ju Bai <baijiaju1990@gmail.com>,
        clm@fb.com, josef@toxicpanda.com, dsterba@suse.com,
        linux-btrfs@vger.kernel.org, linux-kernel@vger.kernel.org
References: <20220324134454.15192-1-baijiaju1990@gmail.com>
 <20220324181940.GK2237@suse.cz>
 <84720b1d-831e-4a2e-e2c5-4f20ac7bb778@gmail.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=iso-8859-1
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
In-Reply-To: <84720b1d-831e-4a2e-e2c5-4f20ac7bb778@gmail.com>
User-Agent: Mutt/1.5.23.1-rc1 (2014-03-12)
Precedence: bulk

On Fri, Mar 25, 2022 at 04:04:17PM +0800, Jia-Ju Bai wrote:
> >> @@ -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.
> 
> Thanks for the reply!
> 
> I think the bug should be introduced by this commit:
> bc44d7c4b2b1 ("btrfs: push btrfs_grab_fs_root into btrfs_get_fs_root")
> 
> This commit has a change:
>  ???? ret = btrfs_insert_fs_root(fs_info, root);
>  ???? if (ret) {
> +??? ? btrfs_put_fs_root(root);
>  ???? ??? if (ret == -EEXIST) {
>  ???? ??? ??? btrfs_free_fs_root(root);
>  ???? ??? ??? goto again;
>  ???????? }
> 
> I could add a Fixes tag of this commit in my V2 patch.
> Is it okay?

I can add it myself, that's a minor thing. The fix is correct, I've
rewritten the changelog a bit, patch now added to misc-next, thanks.