summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNeilBrown <neilb@suse.de>2011-02-16 13:58:51 +1100
committerGreg Kroah-Hartman <gregkh@suse.de>2011-03-02 09:47:05 -0500
commit62ead775d1932164b7113618800d87aed9fa0ac5 (patch)
tree1e8f4d8cb3a4450d4372d43bf2b2835d059646c9
parent9723799aad5d12ac9eb833bdc5abd19b91a3bd67 (diff)
downloadlinux-stable-62ead775d1932164b7113618800d87aed9fa0ac5.tar.gz
linux-stable-62ead775d1932164b7113618800d87aed9fa0ac5.tar.bz2
linux-stable-62ead775d1932164b7113618800d87aed9fa0ac5.zip
md: correctly handle probe of an 'mdp' device.
commit 8f5f02c460b7ca74ce55ce126ce0c1e58a3f923d upstream. 'mdp' devices are md devices with preallocated device numbers for partitions. As such it is possible to mknod and open a partition before opening the whole device. this causes md_probe() to be called with a device number of a partition, which in-turn calls mddev_find with such a number. However mddev_find expects the number of a 'whole device' and does the wrong thing with partition numbers. So add code to mddev_find to remove the 'partition' part of a device number and just work with the 'whole device'. This patch addresses https://bugzilla.kernel.org/show_bug.cgi?id=28652 Reported-by: hkmaly@bigfoot.com Signed-off-by: NeilBrown <neilb@suse.de> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--drivers/md/md.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/md/md.c b/drivers/md/md.c
index 68bfb68af5ad..697a2c7bff2c 100644
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
@@ -305,6 +305,9 @@ static mddev_t * mddev_find(dev_t unit)
{
mddev_t *mddev, *new = NULL;
+ if (unit && MAJOR(unit) != MD_MAJOR)
+ unit &= ~((1<<MdpMinorShift)-1);
+
retry:
spin_lock(&all_mddevs_lock);