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

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

details:   https://anonhg.NetBSD.org/src/rev/bed7c82c4ef9
branches:  netbsd-8
changeset: 435037:bed7c82c4ef9
user:      martin <martin%NetBSD.org@localhost>
date:      Sat Jun 09 14:35:21 2018 +0000

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

        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 b121136fd235 -r bed7c82c4ef9 usr.sbin/makefs/ffs.c
--- a/usr.sbin/makefs/ffs.c     Sat Jun 09 14:32:52 2018 +0000
+++ b/usr.sbin/makefs/ffs.c     Sat Jun 09 14:35:21 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ffs.c,v 1.69 2017/02/08 21:27:26 christos Exp $        */
+/*     $NetBSD: ffs.c,v 1.69.4.1 2018/06/09 14:35:21 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.69 2017/02/08 21:27:26 christos Exp $");
+__RCSID("$NetBSD: ffs.c,v 1.69.4.1 2018/06/09 14:35:21 martin 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);