Changeset dec4150 in mainline

Timestamp:

2025-01-12T21:53:55Z (5 months ago)

Author:

Miroslav Cimerman <mc@…>

Children:

d773bea9

Parents:

401b9e42

git-author:

Miroslav Cimerman <mc@…> (2025-01-12 20:11:54)

git-committer:

Miroslav Cimerman <mc@…> (2025-01-12 21:53:55)

Message:

hr: RAID1: fix unsafe access in add_hotspare()

File:

• uspace/srv/bd/hr/raid1.c (modified) (2 diffs)

uspace/srv/bd/hr/raid1.c

@@ -162 +162 @@
         hr_update_hotspare_status(vol, hs_idx, HR_EXT_HOTSPARE);
 
-        /*
-         * If the volume is degraded, start rebuild right away.
-         */
-        if (vol->status == HR_VOL_DEGRADED) {
-                HR_DEBUG("hr_raid1_add_hotspare(): volume in DEGRADED state, "
-                    "spawning new rebuild fibril\n");
-                fid_t fib = fibril_create(hr_raid1_rebuild, vol);
-                if (fib == 0) {
-                        rc = ENOMEM;
-                        goto error;
-                }
-                fibril_start(fib);
-                fibril_detach(fib);
-        }
-
+        atomic_store(&vol->state_changed, true);
 error:
         fibril_mutex_unlock(&vol->hotspare_lock);
+
+        hr_raid1_update_vol_status(vol);
 
         return rc;
@@ -305 +293 @@
                 }
         } else if (healthy < vol->extent_no) {
+                if (old_state != HR_VOL_REBUILD &&
+                    old_state != HR_VOL_DEGRADED) {
+                        fibril_rwlock_write_lock(&vol->states_lock);
+                        hr_update_vol_status(vol, HR_VOL_DEGRADED);
+                        fibril_rwlock_write_unlock(&vol->states_lock);
+                }
+
                 if (old_state != HR_VOL_REBUILD) {
-                        if (old_state != HR_VOL_DEGRADED) {
-                                fibril_rwlock_write_lock(&vol->states_lock);
-                                hr_update_vol_status(vol, HR_VOL_DEGRADED);
-                                fibril_rwlock_write_unlock(&vol->states_lock);
-                        }
-
                         if (vol->hotspare_no > 0) {
                                 fid_t fib = fibril_create(hr_raid1_rebuild,