diff options
| author | Tsutomu Itoh <t-itoh@jp.fujitsu.com> | 2012-10-16 05:44:21 +0000 |
|---|---|---|
| committer | Chris Mason <chris.mason@fusionio.com> | 2012-10-25 15:45:43 -0400 |
| commit | 5b7ff5b3c4468780b15c6b20cd0567cd9f2aa626 (patch) | |
| tree | 2c2be551f07d275a1a41fb881fe6acbd65fdaa30 | |
| parent | d79e50433b2bea09eb680ed5fae15e8a12356353 (diff) | |
| download | linux-5b7ff5b3c4468780b15c6b20cd0567cd9f2aa626.tar.gz linux-5b7ff5b3c4468780b15c6b20cd0567cd9f2aa626.tar.bz2 linux-5b7ff5b3c4468780b15c6b20cd0567cd9f2aa626.zip | |
Btrfs: fix memory leak in btrfs_quota_enable()
We should free quota_root before returning from the error
handling code.
Signed-off-by: Tsutomu Itoh <t-itoh@jp.fujitsu.com>
| -rw-r--r-- | fs/btrfs/qgroup.c | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/fs/btrfs/qgroup.c b/fs/btrfs/qgroup.c index 5039686df6ae..fe9d02c45f8e 100644 --- a/fs/btrfs/qgroup.c +++ b/fs/btrfs/qgroup.c @@ -790,8 +790,10 @@ int btrfs_quota_enable(struct btrfs_trans_handle *trans, } path = btrfs_alloc_path(); - if (!path) - return -ENOMEM; + if (!path) { + ret = -ENOMEM; + goto out_free_root; + } key.objectid = 0; key.type = BTRFS_QGROUP_STATUS_KEY; @@ -800,7 +802,7 @@ int btrfs_quota_enable(struct btrfs_trans_handle *trans, ret = btrfs_insert_empty_item(trans, quota_root, path, &key, sizeof(*ptr)); if (ret) - goto out; + goto out_free_path; leaf = path->nodes[0]; ptr = btrfs_item_ptr(leaf, path->slots[0], @@ -818,8 +820,15 @@ int btrfs_quota_enable(struct btrfs_trans_handle *trans, fs_info->quota_root = quota_root; fs_info->pending_quota_state = 1; spin_unlock(&fs_info->qgroup_lock); -out: +out_free_path: btrfs_free_path(path); +out_free_root: + if (ret) { + free_extent_buffer(quota_root->node); + free_extent_buffer(quota_root->commit_root); + kfree(quota_root); + } +out: return ret; } |