Module Name: src
Committed By: bouyer
Date: Sun Nov 26 12:40:50 UTC 2023
Modified Files:
src/usr.sbin/sysinst [netbsd-10]: label.c util.c
Log Message:
Pull up following revision(s) (requested by martin in ticket #471):
usr.sbin/sysinst/label.c: revision 1.50
usr.sbin/sysinst/util.c: revision 1.74
Force alignment of disk buffers to at least 8 byte.
Fixes PR 56434.
To generate a diff of this commit:
cvs rdiff -u -r1.46.2.1 -r1.46.2.2 src/usr.sbin/sysinst/label.c
cvs rdiff -u -r1.71.2.1 -r1.71.2.2 src/usr.sbin/sysinst/util.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/sysinst/label.c
diff -u src/usr.sbin/sysinst/label.c:1.46.2.1 src/usr.sbin/sysinst/label.c:1.46.2.2
--- src/usr.sbin/sysinst/label.c:1.46.2.1 Thu Nov 2 14:08:17 2023
+++ src/usr.sbin/sysinst/label.c Sun Nov 26 12:40:50 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: label.c,v 1.46.2.1 2023/11/02 14:08:17 sborrill Exp $ */
+/* $NetBSD: label.c,v 1.46.2.2 2023/11/26 12:40:50 bouyer Exp $ */
/*
* Copyright 1997 Jonathan Stone
@@ -36,7 +36,7 @@
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: label.c,v 1.46.2.1 2023/11/02 14:08:17 sborrill Exp $");
+__RCSID("$NetBSD: label.c,v 1.46.2.2 2023/11/26 12:40:50 bouyer Exp $");
#endif
#include <sys/types.h>
@@ -1965,7 +1965,7 @@ const char *
get_last_mounted(int fd, daddr_t partstart, uint *fs_type, uint *fs_sub_type,
uint flags)
{
- static char sblk[SBLOCKSIZE]; /* is this enough? */
+ static char sblk[SBLOCKSIZE] __aligned(8); /* is this enough? */
struct fs *SB = (struct fs *)sblk;
static const off_t sblocks[] = SBLOCKSEARCH;
const off_t *sbp;
Index: src/usr.sbin/sysinst/util.c
diff -u src/usr.sbin/sysinst/util.c:1.71.2.1 src/usr.sbin/sysinst/util.c:1.71.2.2
--- src/usr.sbin/sysinst/util.c:1.71.2.1 Sat Sep 9 14:50:15 2023
+++ src/usr.sbin/sysinst/util.c Sun Nov 26 12:40:50 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: util.c,v 1.71.2.1 2023/09/09 14:50:15 martin Exp $ */
+/* $NetBSD: util.c,v 1.71.2.2 2023/11/26 12:40:50 bouyer Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -398,7 +398,7 @@ static int
get_iso9660_volname(int dev, int sess, char *volname, size_t volnamelen)
{
int blkno, error, last;
- char buf[ISO_BLKSIZE];
+ static char buf[ISO_BLKSIZE] __aligned(8);
struct iso_volume_descriptor *vd = NULL;
struct iso_primary_descriptor *pd = NULL;
