summaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorDenis Efremov <efremov@linux.com>2020-09-21 20:03:35 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2020-11-05 11:43:26 +0100
commit4b82b8aba08d436b075226a448881b98807981f2 (patch)
tree7600dce6d36f6132d71d7f16fe9a29d3ddd0cc23 /fs
parent6ec4b82fc322a56aa68777f0fb1e14ff57d1f857 (diff)
btrfs: use kvzalloc() to allocate clone_roots in btrfs_ioctl_send()
commit 8eb2fd00153a3a96a19c62ac9c6d48c2efebe5e8 upstream. btrfs_ioctl_send() used open-coded kvzalloc implementation earlier. The code was accidentally replaced with kzalloc() call [1]. Restore the original code by using kvzalloc() to allocate sctx->clone_roots. [1] https://patchwork.kernel.org/patch/9757891/#20529627 Fixes: 818e010bf9d0 ("btrfs: replace opencoded kvzalloc with the helper") CC: stable@vger.kernel.org # 4.14+ Signed-off-by: Denis Efremov <efremov@linux.com> Reviewed-by: David Sterba <dsterba@suse.com> Signed-off-by: David Sterba <dsterba@suse.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'fs')
-rw-r--r--fs/btrfs/send.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/btrfs/send.c b/fs/btrfs/send.c
index 40e56d0f90cf..88940f494428 100644
--- a/fs/btrfs/send.c
+++ b/fs/btrfs/send.c
@@ -7352,7 +7352,7 @@ long btrfs_ioctl_send(struct file *mnt_file, struct btrfs_ioctl_send_args *arg)
alloc_size = sizeof(struct clone_root) * (arg->clone_sources_count + 1);
- sctx->clone_roots = kzalloc(alloc_size, GFP_KERNEL);
+ sctx->clone_roots = kvzalloc(alloc_size, GFP_KERNEL);
if (!sctx->clone_roots) {
ret = -ENOMEM;
goto out;