diff options
| author | Naohiro Aota <naohiro.aota@wdc.com> | 2017-08-25 07:15:14 +0200 |
|---|---|---|
| committer | David Sterba <dsterba@suse.com> | 2017-09-26 14:51:49 +0200 |
| commit | bb166d7207432d3c7d10c45dc052f12ba3a2121d (patch) | |
| tree | beee530f91be31d9ad02c62224711652ddbb9b49 /fs/btrfs/relocation.c | |
| parent | btrfs: finish ordered extent cleaning if no progress is found (diff) | |
| download | linux-bb166d7207432d3c7d10c45dc052f12ba3a2121d.tar.xz linux-bb166d7207432d3c7d10c45dc052f12ba3a2121d.zip | |
btrfs: fix NULL pointer dereference from free_reloc_roots()
__del_reloc_root should be called before freeing up reloc_root->node.
If not, calling __del_reloc_root() dereference reloc_root->node, causing
the system BUG.
Fixes: 6bdf131fac23 ("Btrfs: don't leak reloc root nodes on error")
Cc: <stable@vger.kernel.org> # 4.9
Signed-off-by: Naohiro Aota <naohiro.aota@wdc.com>
Reviewed-by: Nikolay Borisov <nborisov@suse.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
Diffstat (limited to 'fs/btrfs/relocation.c')
| -rw-r--r-- | fs/btrfs/relocation.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/btrfs/relocation.c b/fs/btrfs/relocation.c index 3a49a3c2fca4..9841faef08ea 100644 --- a/fs/btrfs/relocation.c +++ b/fs/btrfs/relocation.c @@ -2400,11 +2400,11 @@ void free_reloc_roots(struct list_head *list) while (!list_empty(list)) { reloc_root = list_entry(list->next, struct btrfs_root, root_list); + __del_reloc_root(reloc_root); free_extent_buffer(reloc_root->node); free_extent_buffer(reloc_root->commit_root); reloc_root->node = NULL; reloc_root->commit_root = NULL; - __del_reloc_root(reloc_root); } } |