[src/netbsd-7]: src/usr.sbin/makefs Pull up following revision(s) (requested ...

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

details:   https://anonhg.NetBSD.org/src/rev/341d386e9fc4
branches:  netbsd-7
changeset: 319664:341d386e9fc4
user:      martin <martin%NetBSD.org@localhost>
date:      Wed Jun 06 15:49:02 2018 +0000

description:
Pull up following revision(s) (requested by maya in ticket #1615):

        usr.sbin/makefs/ffs.c: revision 1.70

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 16506b252bce -r 341d386e9fc4 usr.sbin/makefs/ffs.c
--- a/usr.sbin/makefs/ffs.c     Wed Jun 06 15:46:16 2018 +0000
+++ b/usr.sbin/makefs/ffs.c     Wed Jun 06 15:49:02 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ffs.c,v 1.63.6.1 2015/04/14 05:08:09 snj Exp $ */
+/*     $NetBSD: ffs.c,v 1.63.6.2 2018/06/06 15:49:02 martin 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.63.6.1 2015/04/14 05:08:09 snj Exp $");
+__RCSID("$NetBSD: ffs.c,v 1.63.6.2 2018/06/06 15:49:02 martin Exp $");
 #endif /* !__lint */
 
 #include <sys/param.h>
@@ -1102,7 +1102,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);