diff options
| author | mav <mav@FreeBSD.org> | 2014-01-05 22:14:12 +0000 |
|---|---|---|
| committer | mav <mav@FreeBSD.org> | 2014-01-05 22:14:12 +0000 |
| commit | cebac06b67f84af73f7b568c736a308e9db16fb3 (patch) | |
| tree | f675707dfd37ba78ad235454ebf0b84272c789da /sys/cddl | |
| parent | 0e037d0ee89bf5f6ed599a59942197523e7515f0 (diff) | |
| download | FreeBSD-src-cebac06b67f84af73f7b568c736a308e9db16fb3.zip FreeBSD-src-cebac06b67f84af73f7b568c736a308e9db16fb3.tar.gz | |
MFC r259168:
Don't even try to read vdev labels from devices smaller then SPA_MINDEVSIZE
(64MB). Even if we would find one somehow, ZFS kernel code rejects such
devices. It is funny to look on attempts to read 4 256K vdev labels from
1.44MB floppy, though it is not very practical and quite slow.
Diffstat (limited to 'sys/cddl')
| -rw-r--r-- | sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c index 15685a5..72401d2 100644 --- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c +++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c @@ -370,10 +370,16 @@ vdev_geom_attach_taster(struct g_consumer *cp, struct g_provider *pp) if (pp->flags & G_PF_WITHER) return (EINVAL); - if (pp->sectorsize > VDEV_PAD_SIZE || !ISP2(pp->sectorsize)) - return (EINVAL); g_attach(cp, pp); error = g_access(cp, 1, 0, 0); + if (error == 0) { + if (pp->sectorsize > VDEV_PAD_SIZE || !ISP2(pp->sectorsize)) + error = EINVAL; + else if (pp->mediasize < SPA_MINDEVSIZE) + error = EINVAL; + if (error != 0) + g_access(cp, -1, 0, 0); + } if (error != 0) g_detach(cp); return (error); |
