Filipe David Borba Manana
2013-Jul-30 18:54 UTC
[PATCH] Btrfs: add missing error check to find_parent_nodes
Signed-off-by: Filipe David Borba Manana <fdmanana@gmail.com> --- fs/btrfs/backref.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/fs/btrfs/backref.c b/fs/btrfs/backref.c index 8bc5e8c..1ba87c5 100644 --- a/fs/btrfs/backref.c +++ b/fs/btrfs/backref.c @@ -935,6 +935,8 @@ again: } ret = find_extent_in_eb(eb, bytenr, *extent_item_pos, &eie); + if (ret < 0) + goto out; ref->inode_list = eie; free_extent_buffer(eb); } -- 1.7.9.5 -- To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Zach Brown
2013-Jul-30 23:00 UTC
Re: [PATCH] Btrfs: add missing error check to find_parent_nodes
> diff --git a/fs/btrfs/backref.c b/fs/btrfs/backref.c > index 8bc5e8c..1ba87c5 100644 > --- a/fs/btrfs/backref.c > +++ b/fs/btrfs/backref.c > @@ -935,6 +935,8 @@ again: > } > ret = find_extent_in_eb(eb, bytenr, > *extent_item_pos, &eie); > + if (ret < 0) > + goto out; > ref->inode_list = eie; > free_extent_buffer(eb); > }The eb needs to be freed before the goto. And that there''s now *three* eb freeing paths in this block should be a hint that it should be refactored into a function that frees the eb before returning. - z -- To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Filipe David Borba Manana
2013-Jul-30 23:26 UTC
[PATCH v2] Btrfs: add missing error check to find_parent_nodes
Signed-off-by: Filipe David Borba Manana <fdmanana@gmail.com> --- V2: Ensure extent buffer is freed on error. fs/btrfs/backref.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/fs/btrfs/backref.c b/fs/btrfs/backref.c index 8bc5e8c..980e85a 100644 --- a/fs/btrfs/backref.c +++ b/fs/btrfs/backref.c @@ -935,8 +935,10 @@ again: } ret = find_extent_in_eb(eb, bytenr, *extent_item_pos, &eie); - ref->inode_list = eie; free_extent_buffer(eb); + if (ret < 0) + goto out; + ref->inode_list = eie; } ret = ulist_add_merge(refs, ref->parent, (uintptr_t)ref->inode_list, -- 1.7.9.5 -- To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Filipe David Manana
2013-Jul-30 23:27 UTC
Re: [PATCH] Btrfs: add missing error check to find_parent_nodes
On Wed, Jul 31, 2013 at 12:00 AM, Zach Brown <zab@redhat.com> wrote:>> diff --git a/fs/btrfs/backref.c b/fs/btrfs/backref.c >> index 8bc5e8c..1ba87c5 100644 >> --- a/fs/btrfs/backref.c >> +++ b/fs/btrfs/backref.c >> @@ -935,6 +935,8 @@ again: >> } >> ret = find_extent_in_eb(eb, bytenr, >> *extent_item_pos, &eie); >> + if (ret < 0) >> + goto out; >> ref->inode_list = eie; >> free_extent_buffer(eb); >> } > > The eb needs to be freed before the goto. > > And that there''s now *three* eb freeing paths in this block should be a > hint that it should be refactored into a function that frees the eb > before returning.Thanks, missed that previously.> > - z-- Filipe David Manana, "Reasonable men adapt themselves to the world. Unreasonable men adapt the world to themselves. That''s why all progress depends on unreasonable men." -- To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Jan Schmidt
2013-Jul-31 09:07 UTC
Re: [PATCH v2] Btrfs: add missing error check to find_parent_nodes
On Wed, July 31, 2013 at 01:26 (+0200), Filipe David Borba Manana wrote:> Signed-off-by: Filipe David Borba Manana <fdmanana@gmail.com> > --- > > V2: Ensure extent buffer is freed on error. > > fs/btrfs/backref.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/fs/btrfs/backref.c b/fs/btrfs/backref.c > index 8bc5e8c..980e85a 100644 > --- a/fs/btrfs/backref.c > +++ b/fs/btrfs/backref.c > @@ -935,8 +935,10 @@ again: > } > ret = find_extent_in_eb(eb, bytenr, > *extent_item_pos, &eie); > - ref->inode_list = eie; > free_extent_buffer(eb); > + if (ret < 0) > + goto out; > + ref->inode_list = eie; > } > ret = ulist_add_merge(refs, ref->parent, > (uintptr_t)ref->inode_list, >The only ret < 0 I''m seeing is ENOMEM, so that should be safe. Reviewed-by: Jan Schmidt <list.btrfs@jan-o-sch.net> Thanks, -Jan -- To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html