From 284ae7cab0f7335c9e0aa8992b28415ef1a54c7c Mon Sep 17 00:00:00 2001 From: NeilBrown Date: Fri, 3 Feb 2006 03:03:40 -0800 Subject: [PATCH] md: Handle overflow of mdu_array_info_t->size better mdu_array_info_t->size is 'int', which isn't big enough for the size (in KB of each component in) some arrays. So rather than a random overflow, set size to -1 when it cannot be set correctly. To update aspect on an array, userspace will sometimes: get_array_info change one field set_array_info in this case, we don't want the '-1' in 'size' to change to size, or look like a size change at all. So test for that in update_array_info. Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- drivers/md/md.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/md/md.c b/drivers/md/md.c index 653d4dcbee23..8f161743e18f 100644 --- a/drivers/md/md.c +++ b/drivers/md/md.c @@ -2942,6 +2942,8 @@ static int get_array_info(mddev_t * mddev, void __user * arg) info.ctime = mddev->ctime; info.level = mddev->level; info.size = mddev->size; + if (info.size != mddev->size) /* overflow */ + info.size = -1; info.nr_disks = nr; info.raid_disks = mddev->raid_disks; info.md_minor = mddev->md_minor; @@ -3523,7 +3525,7 @@ static int update_array_info(mddev_t *mddev, mdu_array_info_t *info) ) return -EINVAL; /* Check there is only one change */ - if (mddev->size != info->size) cnt++; + if (info->size >= 0 && mddev->size != info->size) cnt++; if (mddev->raid_disks != info->raid_disks) cnt++; if (mddev->layout != info->layout) cnt++; if ((state ^ info->state) & (1<pers->reconfig(mddev, info->layout, -1); } - if (mddev->size != info->size) + if (info->size >= 0 && mddev->size != info->size) rv = update_size(mddev, info->size); if (mddev->raid_disks != info->raid_disks) -- cgit v1.2.3