From: Liu Bo <bo.li.liu@oracle.com>
To: Chris Mason <clm@fb.com>
Cc: linux-btrfs@vger.kernel.org, David Sterba <dsterba@suse.cz>
Subject: Re: [PATCH] Btrfs: fix panic in balance due to EIO
Date: Tue, 12 Jul 2016 10:08:45 -0700 [thread overview]
Message-ID: <20160712170845.GA2870@localhost.localdomain> (raw)
In-Reply-To: <855a29a1-1b46-c1be-418c-de08cb484bd7@fb.com>
On Tue, Jul 12, 2016 at 11:05:48AM -0400, Chris Mason wrote:
>
>
> On 07/11/2016 08:37 PM, Liu Bo wrote:
> > During build_backref_tree(), if we fail to read a btree node,
> > we can eventually run into BUG_ON(cache->nr_nodes) that we put
> > in backref_cache_cleanup(), meaning we have at least one
> > memory leak.
> >
> > This frees the backref_node that we allocate at the very beginning of build_backref_tree().
> >
> > Signed-off-by: Liu Bo <bo.li.liu@oracle.com>
> > ---
> > fs/btrfs/relocation.c | 7 +++++++
> > 1 file changed, 7 insertions(+)
> >
> > diff --git a/fs/btrfs/relocation.c b/fs/btrfs/relocation.c
> > index 0477dca..f00267a 100644
> > --- a/fs/btrfs/relocation.c
> > +++ b/fs/btrfs/relocation.c
> > @@ -1135,6 +1135,8 @@ out:
> > btrfs_free_path(path1);
> > btrfs_free_path(path2);
> > if (err) {
> > + int orig_free = 0;
> > +
> > while (!list_empty(&useless)) {
> > lower = list_entry(useless.next,
> > struct backref_node, list);
> > @@ -1171,8 +1173,13 @@ out:
> > lower = list_entry(useless.next,
> > struct backref_node, list);
> > list_del_init(&lower->list);
> > + if (lower == node)
> > + orig_free = 1;
> > free_backref_node(cache, lower);
> > }
> > +
> > + if (!orig_free)
> > + free_backref_node(cache, node);
> > return ERR_PTR(err);
> > }
> > ASSERT(!node || !node->detached);
>
> Instead of doing the orig_free set and test
>
> ...
> if (lower == node)
> node = NULL
> free_backref_node(cache, lower)
> }
> free_backref_node(cache, node);
> return ERR_PTR(err);
>
> Your patch isn't wrong, but having node NULL after it was free'd makes us
> less likely to make mistakes as the code changes.
Golden rule indeed.
Thanks,
-liubo
next prev parent reply other threads:[~2016-07-12 17:06 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-07-12 0:37 [PATCH] Btrfs: fix panic in balance due to EIO Liu Bo
2016-07-12 15:05 ` Chris Mason
2016-07-12 17:08 ` Liu Bo [this message]
2016-07-12 17:29 ` [PATCH v2] " Liu Bo
2016-07-12 18:01 ` Chris Mason
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=20160712170845.GA2870@localhost.localdomain \
--to=bo.li.liu@oracle.com \
--cc=clm@fb.com \
--cc=dsterba@suse.cz \
--cc=linux-btrfs@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.