Module Name: src
Committed By: martin
Date: Tue Jun 8 12:59:32 UTC 2021
Modified Files:
src/sbin/dump [netbsd-8]: tape.c
Log Message:
Pull up following revision(s) (requested by hannken in ticket #1683):
sbin/dump/tape.c: revision 1.56
Bitmaps (TS_BITS and TS_CLRI) dont use the "c_addr" array as they
cannot have holes. As bitmaps are written without TS_ADDR records
"c_count" may be larger than the "c_addr" size resulting in a
segmentation violation reading "c_addr" beyond its end.
Compute "blks" for TS_INODE and TS_ADDR only -- its used for multi
volume dumps and the bitmaps must both be on the first volume.
To generate a diff of this commit:
cvs rdiff -u -r1.54.8.1 -r1.54.8.2 src/sbin/dump/tape.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/dump/tape.c
diff -u src/sbin/dump/tape.c:1.54.8.1 src/sbin/dump/tape.c:1.54.8.2
--- src/sbin/dump/tape.c:1.54.8.1 Fri Mar 29 19:43:28 2019
+++ src/sbin/dump/tape.c Tue Jun 8 12:59:32 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: tape.c,v 1.54.8.1 2019/03/29 19:43:28 martin Exp $ */
+/* $NetBSD: tape.c,v 1.54.8.2 2021/06/08 12:59:32 martin Exp $ */
/*-
* Copyright (c) 1980, 1991, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)tape.c 8.4 (Berkeley) 5/1/95";
#else
-__RCSID("$NetBSD: tape.c,v 1.54.8.1 2019/03/29 19:43:28 martin Exp $");
+__RCSID("$NetBSD: tape.c,v 1.54.8.2 2021/06/08 12:59:32 martin Exp $");
#endif
#endif /* not lint */
@@ -328,7 +328,8 @@ flushtape(void)
}
blks = 0;
- if (iswap32(spcl.c_type) != TS_END) {
+ if (iswap32(spcl.c_type) == TS_INODE ||
+ iswap32(spcl.c_type) == TS_ADDR) {
for (i = 0; i < iswap32(spcl.c_count); i++)
if (spcl.c_addr[i] != 0)
blks++;
