From owner-svn-src-all@freebsd.org Sat Jun 16 15:35:31 2018 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 6C373101999C; Sat, 16 Jun 2018 15:35:31 +0000 (UTC) (envelope-from freebsd@pdx.rh.CN85.dnsmgr.net) Received: from pdx.rh.CN85.dnsmgr.net (br1.CN84in.dnsmgr.net [69.59.192.140]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id C9860854BD; Sat, 16 Jun 2018 15:35:30 +0000 (UTC) (envelope-from freebsd@pdx.rh.CN85.dnsmgr.net) Received: from pdx.rh.CN85.dnsmgr.net (localhost [127.0.0.1]) by pdx.rh.CN85.dnsmgr.net (8.13.3/8.13.3) with ESMTP id w5GFZSPF056255; Sat, 16 Jun 2018 08:35:28 -0700 (PDT) (envelope-from freebsd@pdx.rh.CN85.dnsmgr.net) Received: (from freebsd@localhost) by pdx.rh.CN85.dnsmgr.net (8.13.3/8.13.3/Submit) id w5GFZSOG056254; Sat, 16 Jun 2018 08:35:28 -0700 (PDT) (envelope-from freebsd) From: "Rodney W. Grimes" Message-Id: <201806161535.w5GFZSOG056254@pdx.rh.CN85.dnsmgr.net> Subject: Re: svn commit: r334979 - head/sbin/dump In-Reply-To: <201806112038.w5BKcQ7T077645@repo.freebsd.org> To: Warner Losh Date: Sat, 16 Jun 2018 08:35:28 -0700 (PDT) CC: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Reply-To: rgrimes@freebsd.org X-Mailer: ELM [version 2.4ME+ PL121h (25)] MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=US-ASCII X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 16 Jun 2018 15:35:31 -0000 > Author: imp > Date: Mon Jun 11 20:38:26 2018 > New Revision: 334979 > URL: https://svnweb.freebsd.org/changeset/base/334979 > > Log: > Fix a bug in the counting of blks. > > We shouldn't count the bytes set in c_addr for TS_CLRI and TS_BITS > nodes. Those block overload c_count to communicate how many blocks > follow, not now many c_addr spaces are used. Dump would dump core > (now) because memory layout moved around and we'd access elements past > the end to make a count. > > Reviewed by: kib@ Warner, I have finally confirmed that I get the SEGV using dump.r334814, and that I can not make dump.r335244 SEGV. Thanks for fixing this! Rod > Modified: > head/sbin/dump/tape.c > > Modified: head/sbin/dump/tape.c > ============================================================================== > --- head/sbin/dump/tape.c Mon Jun 11 20:26:10 2018 (r334978) > +++ head/sbin/dump/tape.c Mon Jun 11 20:38:26 2018 (r334979) > @@ -279,7 +279,8 @@ flushtape(void) > } > > blks = 0; > - if (spcl.c_type != TS_END) { > + if (spcl.c_type != TS_END && spcl.c_type != TS_CLRI && > + spcl.c_type != TS_BITS) { > assert(spcl.c_count <= TP_NINDIR); > for (i = 0; i < spcl.c_count; i++) > if (spcl.c_addr[i] != 0) > > -- Rod Grimes rgrimes@freebsd.org