Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 96e4fc79 authored by Denis Efremov's avatar Denis Efremov Committed by Greg Kroah-Hartman
Browse files

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: 818e010b ("btrfs: replace opencoded kvzalloc with the helper")
CC: stable@vger.kernel.org # 4.14+
Signed-off-by: default avatarDenis Efremov <efremov@linux.com>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 67dc9c4f

fs/btrfs/send.c

+1 −1
Original line number Diff line number Diff line
@@ -6859,7 +6859,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;