iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

btrfs: send: use vmalloc only as fallback for clone_sources_tmp

Browse Source 
Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
David Sterba
2016-04-11 18:40:08 +02:00
parent c03d01f340
commit 2f91306a37
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
fs/btrfs/send.c
View File

@@ -6065,11 +6065,14 @@ long btrfs_ioctl_send(struct file *mnt_file, void __user *arg_)
alloc_size = arg->clone_sources_count * sizeof(*arg->clone_sources); alloc_size = arg->clone_sources_count * sizeof(*arg->clone_sources);
if (arg->clone_sources_count) { if (arg->clone_sources_count) {
clone_sources_tmp = kmalloc(alloc_size, GFP_KERNEL | __GFP_NOWARN);
if (!clone_sources_tmp) {
clone_sources_tmp = vmalloc(alloc_size); clone_sources_tmp = vmalloc(alloc_size);
if (!clone_sources_tmp) { if (!clone_sources_tmp) {
ret = -ENOMEM; ret = -ENOMEM;
goto out; goto out;
} }
}
ret = copy_from_user(clone_sources_tmp, arg->clone_sources, ret = copy_from_user(clone_sources_tmp, arg->clone_sources,
alloc_size); alloc_size);
@@ -6106,7 +6109,7 @@ long btrfs_ioctl_send(struct file *mnt_file, void __user *arg_)
sctx->clone_roots[i].root = clone_root; sctx->clone_roots[i].root = clone_root;
clone_sources_to_rollback = i + 1; clone_sources_to_rollback = i + 1;
} }
vfree(clone_sources_tmp); kvfree(clone_sources_tmp);
clone_sources_tmp = NULL; clone_sources_tmp = NULL;
} }
@@ -6224,7 +6227,7 @@ out:
btrfs_root_dec_send_in_progress(sctx->parent_root); btrfs_root_dec_send_in_progress(sctx->parent_root);
kfree(arg); kfree(arg);
vfree(clone_sources_tmp); kvfree(clone_sources_tmp);
if (sctx) { if (sctx) {
if (sctx->send_filp) if (sctx->send_filp)