From: Chaohai Chen <wdhh66@163.com>
Date: Fri, 21 Feb 2025 03:07:55 +0000 (+0800)
Subject: scsi: core: Fix missing lock protection
X-Git-Tag: ceph-for-6.16-rc1~433^2~30
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=ed3e4842224ff721f48154c1fed6ef97241249e6;p=ceph-client.git

scsi: core: Fix missing lock protection

async_scan_lock is designed to protect the scanning_hosts list, but there
is no protection here.

Signed-off-by: Chaohai Chen <wdhh66@163.com>
Link: https://lore.kernel.org/r/20250221030755.219277-1-wdhh66@163.com
Reviewed-by: Bart Van Assche <bvanassche@acm.org>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
---

diff --git a/drivers/scsi/scsi_scan.c b/drivers/scsi/scsi_scan.c
index 96d7e1a9a7c7a..4833b8fe251b8 100644
--- a/drivers/scsi/scsi_scan.c
+++ b/drivers/scsi/scsi_scan.c
@@ -151,8 +151,9 @@ int scsi_complete_async_scans(void)
 	struct async_scan_data *data;
 
 	do {
-		if (list_empty(&scanning_hosts))
-			return 0;
+		scoped_guard(spinlock, &async_scan_lock)
+			if (list_empty(&scanning_hosts))
+				return 0;
 		/* If we can't get memory immediately, that's OK.  Just
 		 * sleep a little.  Even if we never get memory, the async
 		 * scans will finish eventually.