diff options
| author | Filipe David Borba Manana | 2013-08-04 20:58:57 +0200 |
|---|---|---|
| committer | Chris Mason | 2013-09-01 14:04:53 +0200 |
| commit | 2bac325ea8f117636e6601e66a67d2df58974610 (patch) | |
| tree | b1dea569df4e30a89fe6b95b1adc2c26ade2f4f3 /fs/btrfs/tree-log.c | |
| parent | Btrfs: allow compressed extents to be merged during defragment (diff) | |
| download | kernel-qcow2-linux-2bac325ea8f117636e6601e66a67d2df58974610.tar.gz kernel-qcow2-linux-2bac325ea8f117636e6601e66a67d2df58974610.tar.xz kernel-qcow2-linux-2bac325ea8f117636e6601e66a67d2df58974610.zip | |
Btrfs: fix inode leak on kmalloc failure in tree-log.c
In tree-log.c:replay_one_name(), if memory allocation for
the name fails, ensure we iput the dir inode we got before
before we return.
Signed-off-by: Filipe David Borba Manana <fdmanana@gmail.com>
Signed-off-by: Josef Bacik <jbacik@fusionio.com>
Signed-off-by: Chris Mason <chris.mason@fusionio.com>
Diffstat (limited to 'fs/btrfs/tree-log.c')
| -rw-r--r-- | fs/btrfs/tree-log.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/fs/btrfs/tree-log.c b/fs/btrfs/tree-log.c index ff60d8978ae2..6797a931cf62 100644 --- a/fs/btrfs/tree-log.c +++ b/fs/btrfs/tree-log.c @@ -1536,8 +1536,10 @@ static noinline int replay_one_name(struct btrfs_trans_handle *trans, name_len = btrfs_dir_name_len(eb, di); name = kmalloc(name_len, GFP_NOFS); - if (!name) - return -ENOMEM; + if (!name) { + ret = -ENOMEM; + goto out; + } log_type = btrfs_dir_type(eb, di); read_extent_buffer(eb, name, (unsigned long)(di + 1), |