From owner-svn-src-head@freebsd.org  Tue Oct 22 22:23:59 2019
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.nyi.freebsd.org (Postfix) with ESMTP id AB971166F9D;
 Tue, 22 Oct 2019 22:23:59 +0000 (UTC)
 (envelope-from mckusick@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
 server-signature RSA-PSS (4096 bits)
 client-signature RSA-PSS (4096 bits) client-digest SHA256)
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 46yShv464Zz4LM6;
 Tue, 22 Oct 2019 22:23:59 +0000 (UTC)
 (envelope-from mckusick@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 7020F1B056;
 Tue, 22 Oct 2019 22:23:59 +0000 (UTC)
 (envelope-from mckusick@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x9MMNxup077930;
 Tue, 22 Oct 2019 22:23:59 GMT (envelope-from mckusick@FreeBSD.org)
Received: (from mckusick@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id x9MMNx6J077929;
 Tue, 22 Oct 2019 22:23:59 GMT (envelope-from mckusick@FreeBSD.org)
Message-Id: <201910222223.x9MMNx6J077929@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: mckusick set sender to
 mckusick@FreeBSD.org using -f
From: Kirk McKusick <mckusick@FreeBSD.org>
Date: Tue, 22 Oct 2019 22:23:59 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r353903 - head/sbin/fsck_ffs
X-SVN-Group: head
X-SVN-Commit-Author: mckusick
X-SVN-Commit-Paths: head/sbin/fsck_ffs
X-SVN-Commit-Revision: 353903
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 22 Oct 2019 22:23:59 -0000

Author: mckusick
Date: Tue Oct 22 22:23:59 2019
New Revision: 353903
URL: https://svnweb.freebsd.org/changeset/base/353903

Log:
  Replace an uninitialized variable with the correct element from the
  superblock when doing recovery with journalled soft updates.
  
  Reported by:  Chuck Silvers
  MFC after:    3 days
  Sponsored by: Netflix

Modified:
  head/sbin/fsck_ffs/suj.c

Modified: head/sbin/fsck_ffs/suj.c
==============================================================================
--- head/sbin/fsck_ffs/suj.c	Tue Oct 22 21:46:03 2019	(r353902)
+++ head/sbin/fsck_ffs/suj.c	Tue Oct 22 22:23:59 2019	(r353903)
@@ -1555,7 +1555,7 @@ ino_trunc(ino_t ino, off_t size)
 		/* If we freed everything in this indirect free the indir. */
 		if (lastlbn > lbn)
 			continue;
-		blk_free(DIP(ip, di_ib[i]), 0, frags);
+		blk_free(DIP(ip, di_ib[i]), 0, fs->fs_frag);
 		DIP_SET(ip, di_ib[i], 0);
 	}
 	ino_dirty(ino);