Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Pull up following revision(s) (requested by hannken in ticket #1283): 

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.
This commit is contained in:
martin 2021-06-08 12:55:40 +00:00
parent 54f9230111
commit 75c30ab933
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sbin/dump/tape.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: tape.c,v 1.55 2019/03/01 16:42:11 christos Exp $ */ /* $NetBSD: tape.c,v 1.55.2.1 2021/06/08 12:55:40 martin Exp $ */
/*- /*-
* Copyright (c) 1980, 1991, 1993 * Copyright (c) 1980, 1991, 1993
@ -34,7 +34,7 @@
#if 0 #if 0
static char sccsid[] = "@(#)tape.c 8.4 (Berkeley) 5/1/95"; static char sccsid[] = "@(#)tape.c 8.4 (Berkeley) 5/1/95";
#else #else
__RCSID("$NetBSD: tape.c,v 1.55 2019/03/01 16:42:11 christos Exp $"); __RCSID("$NetBSD: tape.c,v 1.55.2.1 2021/06/08 12:55:40 martin Exp $");
#endif #endif
#endif /* not lint */ #endif /* not lint */
@ -328,7 +328,8 @@ flushtape(void)
} }
blks = 0; 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++) for (i = 0; i < iswap32(spcl.c_count); i++)
if (spcl.c_addr[i] != 0) if (spcl.c_addr[i] != 0)
blks++; blks++;