Commit ccba208a authored by Dmitry Antipov's avatar Dmitry Antipov Committed by sanglipeng1
Browse files

btrfs: fix kvcalloc() arguments order in btrfs_ioctl_send() 

stable inclusion
from stable-v5.10.217
commit a2fb0eefa4fef858b833bdb765be813e407c3ca8
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/IAWLXC

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=a2fb0eefa4fef858b833bdb765be813e407c3ca8



--------------------------------

commit 6ff09b6b8c2fb6b3edda4ffaa173153a40653067 upstream.

When compiling with gcc version 14.0.0 20231220 (experimental)
and W=1, I've noticed the following warning:

fs/btrfs/send.c: In function 'btrfs_ioctl_send':
fs/btrfs/send.c:8208:44: warning: 'kvcalloc' sizes specified with 'sizeof'
in the earlier argument and not in the later argument [-Wcalloc-transposed-args]
 8208 |         sctx->clone_roots = kvcalloc(sizeof(*sctx->clone_roots),
      |                                            ^

Since 'n' and 'size' arguments of 'kvcalloc()' are multiplied to
calculate the final size, their actual order doesn't affect the result
and so this is not a bug. But it's still worth to fix it.

Signed-off-by: default avatarDmitry Antipov <dmantipov@yandex.ru>
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>
Signed-off-by: default avatarsanglipeng1 <sanglipeng1@jd.com>
parent 698809f4

fs/btrfs/send.c

+2 −2
Original line number Diff line number Diff line
@@ -7339,8 +7339,8 @@ long btrfs_ioctl_send(struct file *mnt_file, struct btrfs_ioctl_send_args *arg) 
	sctx->waiting_dir_moves = RB_ROOT;

	sctx->orphan_dirs = RB_ROOT;



	sctx->clone_roots = kvcalloc(sizeof(*sctx->clone_roots),

				     arg->clone_sources_count + 1,

	sctx->clone_roots = kvcalloc(arg->clone_sources_count + 1,

				     sizeof(*sctx->clone_roots),

				     GFP_KERNEL);

	if (!sctx->clone_roots) {

		ret = -ENOMEM;