1 files changed, 10 insertions, 1 deletions

diff --git a/drivers/scsi/scsi_sysfs.c b/drivers/scsi/scsi_sysfs.c
index 64c96c7828ee..6d7362e7367e 100644
--- a/drivers/scsi/scsi_sysfs.c
+++ b/drivers/scsi/scsi_sysfs.c
@@ -730,6 +730,14 @@ sdev_store_delete(struct device *dev, struct device_attribute *attr,
                   const char *buf, size_t count)
 {
         struct kernfs_node *kn;
+        struct scsi_device *sdev = to_scsi_device(dev);
+
+        /*
+         * We need to try to get module, avoiding the module been removed
+         * during delete.
+         */
+        if (scsi_device_get(sdev))
+                return -ENODEV;
 
         kn = sysfs_break_active_protection(&dev->kobj, &attr->attr);
         WARN_ON_ONCE(!kn);
@@ -744,9 +752,10 @@ sdev_store_delete(struct device *dev, struct device_attribute *attr,
          * state into SDEV_DEL.
          */
         device_remove_file(dev, attr);
-        scsi_remove_device(to_scsi_device(dev));
+        scsi_remove_device(sdev);
         if (kn)
                 sysfs_unbreak_active_protection(kn);
+        scsi_device_put(sdev);
         return count;
 };
 static DEVICE_ATTR(delete, S_IWUSR, NULL, sdev_store_delete);