diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-02-15 08:00:35 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-02-15 08:00:35 -0800 |
| commit | 007a14af2649c9ac77f38cd23469518ffb8b355a (patch) | |
| tree | d6bc4477c11d7c8fd892f059acf0fc1ed547ba52 /fs/btrfs/volumes.c | |
| parent | 261cd298a8c363d7985e3482946edb4bfedacf98 (diff) | |
| parent | c26a920373a983b52223eed5a13b97404d8b4158 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable
* git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable:
Btrfs: check return value of alloc_extent_map()
Btrfs - Fix memory leak in btrfs_init_new_device()
btrfs: prevent heap corruption in btrfs_ioctl_space_info()
Btrfs: Fix balance panic
Btrfs: don't release pages when we can't clear the uptodate bits
Btrfs: fix page->private races
Diffstat (limited to 'fs/btrfs/volumes.c')
| -rw-r--r-- | fs/btrfs/volumes.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c index 2636a051e4b..af7dbca1527 100644 --- a/fs/btrfs/volumes.c +++ b/fs/btrfs/volumes.c @@ -1605,12 +1605,14 @@ int btrfs_init_new_device(struct btrfs_root *root, char *device_path) ret = find_next_devid(root, &device->devid); if (ret) { + kfree(device->name); kfree(device); goto error; } trans = btrfs_start_transaction(root, 0); if (IS_ERR(trans)) { + kfree(device->name); kfree(device); ret = PTR_ERR(trans); goto error; |