6.1-stable patches

added patches:
	md-raid1-10-fix-casting-from-randomized-structure-in-raid1_submit_write.patch

diff --git a/queue-6.1/md-raid1-10-fix-casting-from-randomized-structure-in-raid1_submit_write.patch b/queue-6.1/md-raid1-10-fix-casting-from-randomized-structure-in-raid1_submit_write.patch
new file mode 100644 (file)
index 0000000..8f94c74
--- /dev/null
+++ b/queue-6.1/md-raid1-10-fix-casting-from-randomized-structure-in-raid1_submit_write.patch
@@ -0,0 +1,41 @@
+From b5a99602b74bbfa655be509c615181dd95b0719e Mon Sep 17 00:00:00 2001
+From: Yu Kuai <yukuai3@huawei.com>
+Date: Fri, 16 Jun 2023 09:21:36 +0800
+Subject: md/raid1-10: fix casting from randomized structure in raid1_submit_write()
+
+From: Yu Kuai <yukuai3@huawei.com>
+
+commit b5a99602b74bbfa655be509c615181dd95b0719e upstream.
+
+Following build error triggered while build with clang version 17.0.0
+with W=1(this can't be reporduced with gcc 13.1.0):
+
+drivers/md/raid1-10.c:117:25: error: casting from randomized structure
+pointer type 'struct block_device *' to 'struct md_rdev *'
+     117 |         struct md_rdev *rdev = (struct md_rdev *)bio->bi_bdev;
+         |                                ^
+
+Fix this by casting 'bio->bi_bdev' to 'void *', as it used to be.
+
+Reported-by: kernel test robot <lkp@intel.com>
+Closes: https://lore.kernel.org/oe-kbuild-all/202306142042.fmjfmTF8-lkp@intel.com/
+Fixes: 8295efbe68c0 ("md/raid1-10: factor out a helper to submit normal write")
+Signed-off-by: Yu Kuai <yukuai3@huawei.com>
+Signed-off-by: Song Liu <song@kernel.org>
+Link: https://lore.kernel.org/r/20230616012136.3047071-1-yukuai1@huaweicloud.com
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/md/raid1-10.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/md/raid1-10.c
++++ b/drivers/md/raid1-10.c
+@@ -113,7 +113,7 @@ static void md_bio_reset_resync_pages(st
+ 
+ static inline void raid1_submit_write(struct bio *bio)
+ {
+-      struct md_rdev *rdev = (struct md_rdev *)bio->bi_bdev;
++      struct md_rdev *rdev = (void *)bio->bi_bdev;
+ 
+       bio->bi_next = NULL;
+       bio_set_dev(bio, rdev->bdev);

diff --git a/queue-6.1/mm-call-arch_swap_restore-from-do_swap_page.patch b/queue-6.1/mm-call-arch_swap_restore-from-do_swap_page.patch
index d311db9d0595f16a0e22008b6f69e0ed46d21eb3..6d6c06534f06b51f043e9dcf09f1caca4786e26c 100644 (file)
--- a/queue-6.1/mm-call-arch_swap_restore-from-do_swap_page.patch
+++ b/queue-6.1/mm-call-arch_swap_restore-from-do_swap_page.patch
@@ -27,27 +27,22 @@ Cc: <stable@vger.kernel.org>        [6.1+]
 Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 ---
- mm/memory.c | 7 +++++++
+ mm/memory.c |    7 +++++++
  1 file changed, 7 insertions(+)
 
-diff --git a/mm/memory.c b/mm/memory.c
-index 0ae594703021..01f39e8144ef 100644
 --- a/mm/memory.c
 +++ b/mm/memory.c
-@@ -3950,6 +3950,13 @@ vm_fault_t do_swap_page(struct vm_fault *vmf)
-               }
+@@ -3981,6 +3981,13 @@ vm_fault_t do_swap_page(struct vm_fault
        }
  
-+      /*
+       /*
 +       * Some architectures may have to restore extra metadata to the page
 +       * when reading from swap. This metadata may be indexed by swap entry
 +       * so this must be called before swap_free().
 +       */
 +      arch_swap_restore(entry, folio);
 +
-       /*
++      /*
         * Remove the swap entry and conditionally try to free up the swapcache.
         * We're already holding a reference on the page but haven't mapped it
--- 
-2.41.0
-
+        * yet.

diff --git a/queue-6.1/series b/queue-6.1/series
index 5768959b665e194a8298f85466118c62c13b212b..473c5134e342a14b105241e18d099219911e7306 100644 (file)
--- a/queue-6.1/series
+++ b/queue-6.1/series
@@ -372,3 +372,4 @@ smb-client-fix-broken-file-attrs-with-nodfs-mounts.patch
 ksmbd-avoid-field-overflow-warning.patch
 arm64-sme-use-str-p-to-clear-ffr-context-field-in-st.patch
 x86-efi-make-efi_set_virtual_address_map-ibt-safe.patch
+md-raid1-10-fix-casting-from-randomized-structure-in-raid1_submit_write.patch