6.1-stable patches

added patches:
	btrfs-fix-kvcalloc-arguments-order-in-btrfs_ioctl_send.patch

diff --git a/queue-6.1/btrfs-fix-kvcalloc-arguments-order-in-btrfs_ioctl_send.patch b/queue-6.1/btrfs-fix-kvcalloc-arguments-order-in-btrfs_ioctl_send.patch
new file mode 100644 (file)
index 0000000..addef90
--- /dev/null
+++ b/queue-6.1/btrfs-fix-kvcalloc-arguments-order-in-btrfs_ioctl_send.patch
@@ -0,0 +1,43 @@
+From 6ff09b6b8c2fb6b3edda4ffaa173153a40653067 Mon Sep 17 00:00:00 2001
+From: Dmitry Antipov <dmantipov@yandex.ru>
+Date: Thu, 21 Dec 2023 11:47:45 +0300
+Subject: btrfs: fix kvcalloc() arguments order in btrfs_ioctl_send()
+
+From: Dmitry Antipov <dmantipov@yandex.ru>
+
+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: Dmitry Antipov <dmantipov@yandex.ru>
+Reviewed-by: David Sterba <dsterba@suse.com>
+Signed-off-by: David Sterba <dsterba@suse.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ fs/btrfs/send.c |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/fs/btrfs/send.c
++++ b/fs/btrfs/send.c
+@@ -7955,8 +7955,8 @@ long btrfs_ioctl_send(struct inode *inod
+       sctx->rbtree_new_refs = RB_ROOT;
+       sctx->rbtree_deleted_refs = 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;

diff --git a/queue-6.1/series b/queue-6.1/series
index 8ca98760d35723ddaabe88fc998613df388c90f6..ebb5ffb27b635329377b81359875457fc844de7f 100644 (file)
--- a/queue-6.1/series
+++ b/queue-6.1/series
@@ -182,3 +182,4 @@ gpiolib-cdev-fix-uninitialised-kfifo.patch
 drm-amd-display-atom-integrated-system-info-v2_2-for.patch
 maintainers-add-leah-to-6.1-maintainers-file.patch
 drm-amdgpu-once-more-fix-the-call-oder-in-amdgpu_ttm_move-v2.patch
+btrfs-fix-kvcalloc-arguments-order-in-btrfs_ioctl_send.patch