 @@ -1,14 +1,14 @@
-/*	$NetBSD: mkfs.c,v 1.128 2017/02/08 16:11:40 rin Exp $	*/
+/*	$NetBSD: mkfs.c,v 1.129 2020/04/17 09:33:37 jdolecek Exp $	*/
 /*
  * Copyright (c) 1980, 1989, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -63,27 +63,27 @@
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)mkfs.c	8.11 (Berkeley) 5/3/95";
 #else
-__RCSID("$NetBSD: mkfs.c,v 1.128 2017/02/08 16:11:40 rin Exp $");
+__RCSID("$NetBSD: mkfs.c,v 1.129 2020/04/17 09:33:37 jdolecek Exp $");
 #endif
 #endif /* not lint */
 #include <sys/param.h>
 #include <sys/mman.h>
 #include <sys/time.h>
 #include <sys/resource.h>
 #include <ufs/ufs/dinode.h>
 #include <ufs/ufs/dir.h>
 #include <ufs/ufs/ufs_bswap.h>
 #include <ufs/ufs/quota2.h>
 #include <ufs/ffs/fs.h>
 #include <ufs/ffs/ffs_extern.h>
 @@ -190,30 +190,32 @@ mkfs(const char *fsys, int fi, int fo,
 	long long sizepb;
 	int len, col, delta, fld_width, max_cols;
 	struct winsize winsize;
 #ifndef STANDALONE
 	gettimeofday(&tv, NULL);
 #endif
 #ifdef MFS
 	if (mfs && !Nflag) {
 		if ((membase = mkfs_malloc(fssize * sectorsize)) == NULL)
 			exit(12);
+	}
 #endif
-	if ((fsun = calloc(1, sizeof(*fsun))) == NULL)
+	if ((fsun = aligned_alloc(DEV_BSIZE, sizeof(*fsun))) == NULL)
 		exit(12);
-	if ((cgun = calloc(1, sizeof(*cgun))) == NULL)
+	memset(fsun, 0, sizeof(*fsun));
 	if ((cgun = aligned_alloc(DEV_BSIZE, sizeof(*cgun))) == NULL)
 		exit(12);
 	memset(cgun, 0, sizeof(*cgun));
 	fsi = fi;
 	fso = fo;
 	if (Oflag == 0) {
 		sblock.fs_old_inodefmt = FS_42INODEFMT;
 		sblock.fs_maxsymlinklen = 0;
 		sblock.fs_old_flags = 0;
 	} else {
 		sblock.fs_old_inodefmt = FS_44INODEFMT;
 		sblock.fs_maxsymlinklen = (Oflag == 1 ? UFS1_MAXSYMLINKLEN :
 		    UFS2_MAXSYMLINKLEN);
 		sblock.fs_old_flags = FS_FLAGS_UPDATED;
 		if (isappleufs)
 @@ -623,27 +625,27 @@ mkfs(const char *fsys, int fi, int fo,
 			sblkoff += SBLOCKSIZE;
 			for (sz = SBLOCKSIZE; sz <= 0x10000; sz <<= 1)
 				zap_old_sblock(roundup(sblkoff, sz));
+		}
 		/*
 		 * Also zap possible Ext2fs magic leftover to prevent
 		 * kernel vfs_mountroot() and bootloaders from mis-recognizing
 		 * this file system as Ext2fs.
 		 */
 		zap_old_sblock(EXT2FS_SBOFF);
 #ifndef NO_APPLE_UFS
 		if (isappleufs) {
-			struct appleufslabel appleufs;
+			struct appleufslabel appleufs __aligned(DEV_BSIZE);
 			ffs_appleufs_set(&appleufs, appleufs_volname,
 			    tv.tv_sec, 0);
 			wtfs(APPLEUFS_LABEL_OFFSET/sectorsize,
 			    APPLEUFS_LABEL_SIZE, &appleufs);
 		} else if (APPLEUFS_LABEL_SIZE % sectorsize == 0) {
 			struct appleufslabel appleufs;
 			/* Look for & zap any existing valid apple ufs labels */
 			rdfs(APPLEUFS_LABEL_OFFSET/sectorsize,
 			    APPLEUFS_LABEL_SIZE, &appleufs);
 			if (ffs_appleufs_validate(fsys, &appleufs, NULL) == 0) {
 				memset(&appleufs, 0, sizeof(appleufs));
 				wtfs(APPLEUFS_LABEL_OFFSET/sectorsize,
 				    APPLEUFS_LABEL_SIZE, &appleufs);
 @@ -1024,27 +1026,27 @@ struct direct lost_found_dir[] = {
 struct odirect olost_found_dir[] = {
 	{ LOSTFOUNDINO, sizeof(struct direct), 1, "." },
 	{ UFS_ROOTINO, sizeof(struct direct), 2, ".." },
 	{ 0, DIRBLKSIZ, 0, 0 },
 };
 #endif
 static void copy_dir(struct direct *, struct direct *);
 int
 fsinit(const struct timeval *tv, mode_t mfsmode, uid_t mfsuid, gid_t mfsgid)
+{
 	union dinode node;
-	union Buffer buf;
+	union Buffer buf __aligned(DEV_BSIZE);
 	int i;
 	int qblocks = 0;
 	int qinos = 0;
 	uint8_t q2h_hash_shift;
 	uint16_t q2h_hash_mask;
 #ifdef LOSTDIR
 	int dirblksiz = DIRBLKSIZ;
 	if (isappleufs)
 		dirblksiz = APPLEUFS_DIRBLKSIZ;
 	int nextino = LOSTFOUNDINO+1;
 #else
 	int nextino = UFS_ROOTINO+1;
 #endif
 @@ -1574,27 +1576,27 @@ ilog2(int val)
+{
 	u_int n;
 	for (n = 0; n < sizeof(n) * CHAR_BIT; n++)
 		if (1 << n == val)
 			return (n);
 	errx(1, "ilog2: %d is not a power of 2", val);
+}
 static void
 zap_old_sblock(int sblkoff)
+{
 	static int cg0_data;
-	uint32_t oldfs[SBLOCKSIZE / 4];
+	uint32_t oldfs[SBLOCKSIZE / 4] __aligned(DEV_BSIZE);
 	static const struct fsm {
 		uint32_t	offset;
 		uint32_t	magic;
 		uint32_t	mask;
 	} fs_magics[] = {
 		{offsetof(struct fs, fs_magic)/4, FS_UFS1_MAGIC, ~0u},
 		{offsetof(struct fs, fs_magic)/4, FS_UFS2_MAGIC, ~0u},
 		{0, 0x70162, ~0u},		/* LFS_MAGIC */
 		{14, 0xef53, 0xffff},		/* EXT2FS (little) */
 		{14, 0xef530000, 0xffff0000},	/* EXT2FS (big) */
 		{.offset = ~0u},
 	};
 	const struct fsm *fsm;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: newfs.c,v 1.115 2017/02/08 16:11:40 rin Exp $	*/
+/*	$NetBSD: newfs.c,v 1.116 2020/04/17 09:33:37 jdolecek Exp $	*/
 /*
  * Copyright (c) 1983, 1989, 1993, 1994
  *	The Regents of the University of California.  All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -68,27 +68,27 @@
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
 #ifndef lint
 __COPYRIGHT("@(#) Copyright (c) 1983, 1989, 1993, 1994\
  The Regents of the University of California.  All rights reserved.");
 #endif /* not lint */
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)newfs.c	8.13 (Berkeley) 5/1/95";
 #else
-__RCSID("$NetBSD: newfs.c,v 1.115 2017/02/08 16:11:40 rin Exp $");
+__RCSID("$NetBSD: newfs.c,v 1.116 2020/04/17 09:33:37 jdolecek Exp $");
 #endif
 #endif /* not lint */
 /*
  * newfs: friendly front end to mkfs
  */
 #include <sys/param.h>
 #include <sys/ioctl.h>
 #include <sys/disklabel.h>
 #include <sys/disk.h>
 #include <sys/file.h>
 #include <sys/mount.h>
 #include <sys/sysctl.h>
 @@ -609,29 +609,30 @@ main(int argc, char *argv[])
 	if (Zflag && fso != -1) {	/* pre-zero (and de-sparce) the file */
 		char	*buf;
 		int	bufsize, i;
 		off_t	bufrem;
 		struct statvfs sfs;
 		if (fstatvfs(fso, &sfs) == -1) {
 			warn("can't fstatvfs `%s'", special);
 			bufsize = 8192;
 		} else
 			bufsize = sfs.f_iosize;
-		if ((buf = calloc(1, bufsize)) == NULL)
+		if ((buf = aligned_alloc(DEV_BSIZE, bufsize)) == NULL)
 			err(1, "can't malloc buffer of %d",
 			bufsize);
 		memset(buf, 0, bufsize);
 		bufrem = fssize * sectorsize;
 		if (verbosity > 0)
 			printf( "Creating file system image in `%s', "
 			    "size %lld bytes, in %d byte chunks.\n",
 			    special, (long long)bufrem, bufsize);
 		while (bufrem > 0) {
 			i = write(fso, buf, MIN(bufsize, bufrem));
 			if (i == -1)
 				err(1, "writing image");
 			bufrem -= i;
+		}
 		free(buf);
+	}