glabel for ufs: size check is overzealous?

[Andriy Gapon]

on 21/04/2009 19:45 Andriy Gapon said the following:
> Maybe this is a check against disk space being re-used for some other fs and
> super-block staying sufficiently intact. But, OTOH, fs_fsize and fs_size could
> still match the raw media in this case too.
> If some extra sanity checks are needed in addition to magic then
> fs_bmask/fs_fmask/fs_bshift/fs_fshift and/or any other derived fields could be used.
> 

BTW, right now I put this in my local tree:

diff --git a/sys/geom/label/g_label_ufs.c b/sys/geom/label/g_label_ufs.c
index 8510fc0..0cffb8d 100644
--- a/sys/geom/label/g_label_ufs.c
+++ b/sys/geom/label/g_label_ufs.c
@@ -83,10 +83,10 @@ g_label_ufs_taste_common(struct g_consumer *cp, char *label,
size_t size, int wh
 			continue;
 		/* Check for magic and make sure things are the right size */
 		if (fs->fs_magic == FS_UFS1_MAGIC && fs->fs_fsize > 0 &&
-		    pp->mediasize / fs->fs_fsize == fs->fs_old_size) {
+		    pp->mediasize / fs->fs_fsize >= fs->fs_old_size) {
 		    	/* Valid UFS1. */
 		} else if (fs->fs_magic == FS_UFS2_MAGIC && fs->fs_fsize > 0 &&
-		    pp->mediasize / fs->fs_fsize == fs->fs_size) {
+		    pp->mediasize / fs->fs_fsize >= fs->fs_size) {
 		    	/* Valid UFS2. */
 		} else {
 			g_free(fs);

-- 
Andriy Gapon