diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-11-09 17:30:24 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-11-09 17:30:24 -0500 |
| commit | c4c23fb6f2b17c922b493f79cf27a0d32397f461 (patch) | |
| tree | 64b651ddc98fde641da2e1dd93d1bdca619565a4 /fs | |
| parent | 0b0c7dbd986440474b4d6771611da59c22b63078 (diff) | |
| parent | 6e5aafb27419f32575b27ef9d6a31e5d54661aca (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs
Pull btrfs fix from Chris Mason:
"It's a one liner for an error cleanup path that leads to crashes"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs:
Btrfs: fix kfree on list_head in btrfs_lookup_csums_range error cleanup
Diffstat (limited to 'fs')
| -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 783a94355efd..84a2d1868271 100644 --- a/fs/btrfs/file-item.c +++ b/fs/btrfs/file-item.c | |||
| @@ -413,7 +413,7 @@ int btrfs_lookup_csums_range(struct btrfs_root *root, u64 start, u64 end, | |||
| 413 | ret = 0; | 413 | ret = 0; |
| 414 | fail: | 414 | fail: |
| 415 | while (ret < 0 && !list_empty(&tmplist)) { | 415 | while (ret < 0 && !list_empty(&tmplist)) { |
| 416 | sums = list_entry(&tmplist, struct btrfs_ordered_sum, list); | 416 | sums = list_entry(tmplist.next, struct btrfs_ordered_sum, list); |
| 417 | list_del(&sums->list); | 417 | list_del(&sums->list); |
| 418 | kfree(sums); | 418 | kfree(sums); |
| 419 | } | 419 | } |