Skip to contentSkip to conversation

Patch "dm raid: stop using BUG() in __rdev_sectors()" has been added to the 4.12-stable tree

PATCH [email protected] 1 participant 1 message Jul 25, 2017

Subsystems (2)
Stable branch Device mapper
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

dm raid: stop using BUG() in __rdev_sectors()

to the 4.12-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
dm-raid-stop-using-bug-in-__rdev_sectors.patch
and it can be found in the queue-4.12 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From 4d49f1b4a1fcab16b6dd1c79ef14f2b6531d50a6 Mon Sep 17 00:00:00 2001

From: Heinz Mauelshagen <[email protected]>
Date: Fri, 30 Jun 2017 15:45:58 +0200
Subject: dm raid: stop using BUG() in __rdev_sectors()

From: Heinz Mauelshagen <[email protected]>

commit 4d49f1b4a1fcab16b6dd1c79ef14f2b6531d50a6 upstream.

Return 0 rather than BUG() if __rdev_sectors() fails and catch invalid rdev size in the constructor.

Reported-by Hannes Reinecke <[email protected]>
Signed-off-by Heinz Mauelshagen <[email protected]>
Signed-off-by Mike Snitzer <[email protected]>
Signed-off-by Greg Kroah-Hartman <[email protected]>
---
 drivers/md/dm-raid.c |   13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)
drivers/md/dm-raid.c +10 -3
@@ -1571,7 +1571,7 @@ static sector_t __rdev_sectors(struct ra
 			return rdev->sectors;
 	}
 
-	BUG(); /* Constructor ensures we got some. */
+	return 0;
 }
 
 /* Calculate the sectors per device and per array used for @rs */

@@ -2941,7 +2941,7 @@ static int raid_ctr(struct dm_target *ti
 	bool resize;
 	struct raid_type *rt;
 	unsigned int num_raid_params, num_raid_devs;
-	sector_t calculated_dev_sectors;
+	sector_t calculated_dev_sectors, rdev_sectors;
 	struct raid_set *rs = NULL;
 	const char *arg;
 	struct rs_layout rs_layout;

@@ -3017,7 +3017,14 @@ static int raid_ctr(struct dm_target *ti
 	if (r)
 		goto bad;
 
-	resize = calculated_dev_sectors != __rdev_sectors(rs);
+	rdev_sectors = __rdev_sectors(rs);
+	if (!rdev_sectors) {
+		ti->error = "Invalid rdev size";
+		r = -EINVAL;
+		goto bad;
+	}
+
+	resize = calculated_dev_sectors != rdev_sectors;
 
 	INIT_WORK(&rs->md.event_work, do_table_event);
 	ti->private = rs;

Patches currently in stable-queue which might be from [email protected] are

queue-4.12/dm-raid-stop-using-bug-in-__rdev_sectors.patch