md: check for NULL ->meta_bdev before calling bdev_read_only

->meta_bdev is optional and not set for most arrays.  Add a
rdev_read_only helper that calls bdev_read_only for both devices
in a safe way.

Fixes: 5b97dec42327 ("block: remove the NULL bdev check in bdev_read_only")
Reported-by: Guoqing Jiang <guoqing.jiang@cloud.ionos.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/drivers/md/md.c b/drivers/md/md.c
index 399c81bddc1ae1b195ba4ff36de35abbd0c5f3d8..7c0f6107865383bd64ee1be771f4ffa2d1ff376d 100644 (file)
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
@@ -2399,6 +2399,12 @@ int md_integrity_add_rdev(struct md_rdev *rdev, struct mddev *mddev)
 }
 EXPORT_SYMBOL(md_integrity_add_rdev);
 
+static bool rdev_read_only(struct md_rdev *rdev)
+{
+       return bdev_read_only(rdev->bdev) ||
+               (rdev->meta_bdev && bdev_read_only(rdev->meta_bdev));
+}
+
 static int bind_rdev_to_array(struct md_rdev *rdev, struct mddev *mddev)
 {
        char b[BDEVNAME_SIZE];
@@ -2408,8 +2414,7 @@ static int bind_rdev_to_array(struct md_rdev *rdev, struct mddev *mddev)
        if (find_rdev(mddev, rdev->bdev->bd_dev))
                return -EEXIST;
 
-       if ((bdev_read_only(rdev->bdev) || bdev_read_only(rdev->meta_bdev)) &&
-           mddev->pers)
+       if (rdev_read_only(rdev) && mddev->pers)
                return -EROFS;
 
        /* make sure rdev->sectors exceeds mddev->dev_sectors */
@@ -5843,9 +5848,7 @@ int md_run(struct mddev *mddev)
                        continue;
                sync_blockdev(rdev->bdev);
                invalidate_bdev(rdev->bdev);
-               if (mddev->ro != 1 &&
-                   (bdev_read_only(rdev->bdev) ||
-                    bdev_read_only(rdev->meta_bdev))) {
+               if (mddev->ro != 1 && rdev_read_only(rdev)) {
                        mddev->ro = 1;
                        if (mddev->gendisk)
                                set_disk_ro(mddev->gendisk, 1);