[1/2] btrfs: use kvzalloc() to allocate clone_roots in btrfs_ioctl_send()
diff mbox series

Message ID 20200921170336.82643-1-efremov@linux.com
State Accepted
Commit 8eb2fd00153a3a96a19c62ac9c6d48c2efebe5e8
Headers show
Series
  • [1/2] btrfs: use kvzalloc() to allocate clone_roots in btrfs_ioctl_send()
Related show

Commit Message

Denis Efremov Sept. 21, 2020, 5:03 p.m. UTC
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

Cc: stable@vger.kernel.org
Fixes: 818e010bf9d0 ("btrfs: replace opencoded kvzalloc with the helper")
Signed-off-by: Denis Efremov <efremov@linux.com>
---
 fs/btrfs/send.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

David Sterba Sept. 21, 2020, 6:43 p.m. UTC | #1
On Mon, Sep 21, 2020 at 08:03:35PM +0300, Denis Efremov wrote:
> 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
> 
> Cc: stable@vger.kernel.org
> Fixes: 818e010bf9d0 ("btrfs: replace opencoded kvzalloc with the helper")
> Signed-off-by: Denis Efremov <efremov@linux.com>

Thanks, the kvzalloc fixup got lost on the way.

Patch
diff mbox series

diff --git a/fs/btrfs/send.c b/fs/btrfs/send.c
index d9813a5b075a..c874ddda6252 100644
--- a/fs/btrfs/send.c
+++ b/fs/btrfs/send.c
@@ -7181,7 +7181,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;