[src/trunk]: src/sbin/fsck_ext2fs adjust inode size check to compare against ...

[jdolecek <jdolecek%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/89fcc5412738
branches:  trunk
changeset: 347143:89fcc5412738
user:      jdolecek <jdolecek%NetBSD.org@localhost>
date:      Mon Aug 15 18:57:06 2016 +0000

description:
adjust inode size check to compare against EXT2_REV0_DINODE_SIZE, rather then sizeof(struct ext2fs_dinode), as the structure definition was expanded with the optional fields

diffstat:

 sbin/fsck_ext2fs/setup.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r 4c247f63f1c5 -r 89fcc5412738 sbin/fsck_ext2fs/setup.c
--- a/sbin/fsck_ext2fs/setup.c  Mon Aug 15 18:46:11 2016 +0000
+++ b/sbin/fsck_ext2fs/setup.c  Mon Aug 15 18:57:06 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: setup.c,v 1.33 2016/08/15 18:42:15 jdolecek Exp $      */
+/*     $NetBSD: setup.c,v 1.34 2016/08/15 18:57:06 jdolecek Exp $      */
 
 /*
  * Copyright (c) 1980, 1986, 1993
@@ -58,7 +58,7 @@
 #if 0
 static char sccsid[] = "@(#)setup.c    8.5 (Berkeley) 11/23/94";
 #else
-__RCSID("$NetBSD: setup.c,v 1.33 2016/08/15 18:42:15 jdolecek Exp $");
+__RCSID("$NetBSD: setup.c,v 1.34 2016/08/15 18:57:06 jdolecek Exp $");
 #endif
 #endif /* not lint */
 
@@ -306,7 +306,7 @@
        }
        if (sblock.e2fs.e2fs_rev > E2FS_REV0 &&
            (!powerof2(sblock.e2fs.e2fs_inode_size) ||
-            sblock.e2fs.e2fs_inode_size < sizeof(struct ext2fs_dinode) ||
+            sblock.e2fs.e2fs_inode_size < EXT2_REV0_DINODE_SIZE ||
             sblock.e2fs.e2fs_inode_size >
              (1024 << sblock.e2fs.e2fs_log_bsize))) {
                badsb(listerr, "BAD INODE_SIZE");