diff options
| author | Chris Mason <clm@fb.com> | 2014-11-04 06:59:04 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-11-14 08:48:01 -0800 |
| commit | 58f382ffaf2570032da636a348aa6c045a166f4e (patch) | |
| tree | e0111ae2df000bdea4660008bb91a802036136bb | |
| parent | 96db973853b1d5a93836261b0edcc877ddc335a4 (diff) | |
| download | lwn-58f382ffaf2570032da636a348aa6c045a166f4e.tar.gz lwn-58f382ffaf2570032da636a348aa6c045a166f4e.zip | |
Btrfs: fix kfree on list_head in btrfs_lookup_csums_range error cleanup
commit 6e5aafb27419f32575b27ef9d6a31e5d54661aca upstream.
If we hit any errors in btrfs_lookup_csums_range, we'll loop through all
the csums we allocate and free them. But the code was using list_entry
incorrectly, and ended up trying to free the on-stack list_head instead.
This bug came from commit 0678b6185
btrfs: Don't BUG_ON kzalloc error in btrfs_lookup_csums_range()
Signed-off-by: Chris Mason <clm@fb.com>
Reported-by: Erik Berg <btrfs@slipsprogrammoer.no>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | fs/btrfs/file-item.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/btrfs/file-item.c b/fs/btrfs/file-item.c index 3af77aa051d2..e4bcfec7787e 100644 --- a/fs/btrfs/file-item.c +++ b/fs/btrfs/file-item.c @@ -403,7 +403,7 @@ int btrfs_lookup_csums_range(struct btrfs_root *root, u64 start, u64 end, ret = 0; fail: while (ret < 0 && !list_empty(&tmplist)) { - sums = list_entry(&tmplist, struct btrfs_ordered_sum, list); + sums = list_entry(tmplist.next, struct btrfs_ordered_sum, list); list_del(&sums->list); kfree(sums); } |