[PATCH v5 3/3] md: enforce max_disks and MD_SB_DISKS in raid_disks and slot sysfs stores

From: Chandradhar Kumar

Date: Tue Nov 17 2026 - 04:21:55 EST


Userspace can configure a persistent v0.90 array via sysfs with
mddev->raid_disks > MD_SB_DISKS or rdev->raid_disk >= MD_SB_DISKS when
mddev->max_disks is not yet populated or when writing to the inactive
or reshape sysfs paths.

Enforce the disk and slot bounds in raid_disks_store() and slot_store()
so invalid configurations are rejected upfront with -EINVAL or -ENOSPC:

1. In raid_disks_store(), reject values exceeding INT_MAX to prevent
signed overflow when assigning to mddev->raid_disks, and check
mddev->max_disks and MD_SB_DISKS (for persistent v0.90 arrays)
before branching into active, reshape, or inactive configuration.
2. In slot_store(), reject slot >= mddev->max_disks or slot >=
MD_SB_DISKS (for persistent v0.90 arrays) in both the active
hot-add and inactive configuration branches.

Fixes: 1a33a379e678 ("md: reject v0.90 arrays with too many devices")
Signed-off-by: Chandradhar Kumar <chandradhar.2003@xxxxxxxxx>
---
drivers/md/md.c | 21 +++++++++++++++++++++
1 file changed, 21 insertions(+)

diff --git a/drivers/md/md.c b/drivers/md/md.c
index b09553078353..9fac810edc26 100644
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
@@ -3387,6 +3387,12 @@ slot_store(struct md_rdev *rdev, const char *buf, size_t len)
if (slot >= rdev->mddev->raid_disks &&
slot >= rdev->mddev->raid_disks + rdev->mddev->delta_disks)
return -ENOSPC;
+ if ((rdev->mddev->max_disks &&
+ slot >= rdev->mddev->max_disks) ||
+ (rdev->mddev->persistent &&
+ rdev->mddev->major_version == 0 &&
+ slot >= MD_SB_DISKS))
+ return -ENOSPC;

rdev->raid_disk = slot;
if (test_bit(In_sync, &rdev->flags))
@@ -3408,6 +3414,12 @@ slot_store(struct md_rdev *rdev, const char *buf, size_t len)
if (slot >= rdev->mddev->raid_disks &&
slot >= rdev->mddev->raid_disks + rdev->mddev->delta_disks)
return -ENOSPC;
+ if ((rdev->mddev->max_disks &&
+ slot >= rdev->mddev->max_disks) ||
+ (rdev->mddev->persistent &&
+ rdev->mddev->major_version == 0 &&
+ slot >= MD_SB_DISKS))
+ return -ENOSPC;
rdev->raid_disk = slot;
/* assume it is working */
clear_bit(Faulty, &rdev->flags);
@@ -4471,11 +4483,20 @@ raid_disks_store(struct mddev *mddev, const char *buf, size_t len)
err = kstrtouint(buf, 10, &n);
if (err < 0)
return err;
+ if (n > INT_MAX)
+ return -EINVAL;

err = mddev_suspend_and_lock(mddev);
if (err)
return err;
noio_flags = memalloc_noio_save();
+ if ((mddev->max_disks && n > mddev->max_disks) ||
+ (mddev->persistent && mddev->major_version == 0 &&
+ n > MD_SB_DISKS)) {
+ err = -EINVAL;
+ goto out_unlock;
+ }
+
if (mddev->pers) {
if (n != mddev->raid_disks)
err = update_raid_disks(mddev, n);
--
2.56.1