[src/trunk]: src/usr.sbin/makefs PR/52828: Mark Johnston: makefs UFS2 lazy in...

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

details:   https://anonhg.NetBSD.org/src/rev/f6598e8bd1ff
branches:  trunk
changeset: 828505:f6598e8bd1ff
user:      christos <christos%NetBSD.org@localhost>
date:      Sat Dec 16 23:08:40 2017 +0000

description:
PR/52828: Mark Johnston: makefs UFS2 lazy inode initialization is buggy

makefs(8) emulates UFS2 in performing lazy initialization of inode
blocks when allocating and writing inodes. However, it only ever
initializes one inode block at a time, which may be insufficient.
If so, a later initialization may clobber an inode, resulting in
an inconsistent filesystem.

I committed a minimal fix for the problem to FreeBSD:
https://svnweb.freebsd.org/changeset/base/326912

diffstat:

 usr.sbin/makefs/ffs.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r 67fc12840681 -r f6598e8bd1ff usr.sbin/makefs/ffs.c
--- a/usr.sbin/makefs/ffs.c     Sat Dec 16 21:28:19 2017 +0000
+++ b/usr.sbin/makefs/ffs.c     Sat Dec 16 23:08:40 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ffs.c,v 1.69 2017/02/08 21:27:26 christos Exp $        */
+/*     $NetBSD: ffs.c,v 1.70 2017/12/16 23:08:40 christos Exp $        */
 
 /*
  * Copyright (c) 2001 Wasabi Systems, Inc.
@@ -71,7 +71,7 @@
 
 #include <sys/cdefs.h>
 #if defined(__RCSID) && !defined(__lint)
-__RCSID("$NetBSD: ffs.c,v 1.69 2017/02/08 21:27:26 christos Exp $");
+__RCSID("$NetBSD: ffs.c,v 1.70 2017/12/16 23:08:40 christos Exp $");
 #endif /* !__lint */
 
 #include <sys/param.h>
@@ -1115,7 +1115,7 @@
         * Initialize inode blocks on the fly for UFS2.
         */
        initediblk = ufs_rw32(cgp->cg_initediblk, fsopts->needswap);
-       if (ffs_opts->version == 2 &&
+       while (ffs_opts->version == 2 &&
            (uint32_t)(cgino + FFS_INOPB(fs)) > initediblk &&
            initediblk < ufs_rw32(cgp->cg_niblk, fsopts->needswap)) {
                memset(buf, 0, fs->fs_bsize);