Fixes for 4.19

Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/queue-4.19/series b/queue-4.19/series
index 54ddeb91646bb32d99ad7de6222f7afa94434cff..8c0f61b53fd27df2e4c083571f3327ff39456b60 100644 (file)
--- a/queue-4.19/series
+++ b/queue-4.19/series
@@ -62,3 +62,4 @@ intel_th-pci-add-lunar-lake-support.patch
 nilfs2-fix-potential-kernel-bug-due-to-lack-of-writeback-flag-waiting.patch
 hv_utils-drain-the-timesync-packets-on-onchannelcallback.patch
 hugetlb_encode.h-fix-undefined-behaviour-34-26.patch
+usb-storage-alauda-check-whether-the-media-is-initia.patch

diff --git a/queue-4.19/usb-storage-alauda-check-whether-the-media-is-initia.patch b/queue-4.19/usb-storage-alauda-check-whether-the-media-is-initia.patch
new file mode 100644 (file)
index 0000000..b5c915a
--- /dev/null
+++ b/queue-4.19/usb-storage-alauda-check-whether-the-media-is-initia.patch
@@ -0,0 +1,61 @@
+From 01930d02913be908a334e62f6469d686b70698f5 Mon Sep 17 00:00:00 2001
+From: Sasha Levin <sashal@kernel.org>
+Date: Sun, 26 May 2024 09:27:45 +0800
+Subject: usb-storage: alauda: Check whether the media is initialized
+
+From: Shichao Lai <shichaorai@gmail.com>
+
+[ Upstream commit 16637fea001ab3c8df528a8995b3211906165a30 ]
+
+The member "uzonesize" of struct alauda_info will remain 0
+if alauda_init_media() fails, potentially causing divide errors
+in alauda_read_data() and alauda_write_lba().
+- Add a member "media_initialized" to struct alauda_info.
+- Change a condition in alauda_check_media() to ensure the
+  first initialization.
+- Add an error check for the return value of alauda_init_media().
+
+Fixes: e80b0fade09e ("[PATCH] USB Storage: add alauda support")
+Reported-by: xingwei lee <xrivendell7@gmail.com>
+Reported-by: yue sun <samsun1006219@gmail.com>
+Reviewed-by: Alan Stern <stern@rowland.harvard.edu>
+Signed-off-by: Shichao Lai <shichaorai@gmail.com>
+Link: https://lore.kernel.org/r/20240526012745.2852061-1-shichaorai@gmail.com
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Signed-off-by: Sasha Levin <sashal@kernel.org>
+---
+ drivers/usb/storage/alauda.c | 9 ++++++---
+ 1 file changed, 6 insertions(+), 3 deletions(-)
+
+diff --git a/drivers/usb/storage/alauda.c b/drivers/usb/storage/alauda.c
+index 50c8bd7cbfddb..f29784fb908e6 100644
+--- a/drivers/usb/storage/alauda.c
++++ b/drivers/usb/storage/alauda.c
+@@ -104,6 +104,8 @@ struct alauda_info {
+       unsigned char sense_key;
+       unsigned long sense_asc;        /* additional sense code */
+       unsigned long sense_ascq;       /* additional sense code qualifier */
++
++      bool media_initialized;
+ };
+ 
+ #define short_pack(lsb,msb) ( ((u16)(lsb)) | ( ((u16)(msb))<<8 ) )
+@@ -475,11 +477,12 @@ static int alauda_check_media(struct us_data *us)
+       }
+ 
+       /* Check for media change */
+-      if (status[0] & 0x08) {
++      if (status[0] & 0x08 || !info->media_initialized) {
+               usb_stor_dbg(us, "Media change detected\n");
+               alauda_free_maps(&MEDIA_INFO(us));
+-              alauda_init_media(us);
+-
++              rc = alauda_init_media(us);
++              if (rc == USB_STOR_TRANSPORT_GOOD)
++                      info->media_initialized = true;
+               info->sense_key = UNIT_ATTENTION;
+               info->sense_asc = 0x28;
+               info->sense_ascq = 0x00;
+-- 
+2.43.0
+