From nobody Tue Apr 18 23:14:00 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Q1KVd2Gjjz45qFf; Tue, 18 Apr 2023 23:14:01 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Q1KVd01B4z4Dp3; Tue, 18 Apr 2023 23:14:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681859641; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vJRtmDdJD+dthwNGHQ7EX9y9DTn8PVAc2I0uFv7UT7I=; b=QdxbcPDdrs0zXFQzPG0wEzguA6lCaT24qKIl1/6qGwr9FT+mDnOtgtcm2LkKuycJaIGmDH bbe32GA3qRiwKa9eyoyFZHMz0cY2n8i/xJeAbhv0DI6dsAwK92vd27gX8nL/Hx1xOECv6J a75E3X/JO4+RWRmeoGZtCKd4C/0BZQHwFJp38pFhVlE1mU8qVpdCUh5a38tFNcZfn31wNU gmMZXEPTlMP/SD5I2JgfdeT4nAA2YVdPzzb4jisqiKcy0EqySTzmJym4KKP937UiBwR5Pk ECZCJTZn1OIcukZ9AoAlZ1aV2bHYx607Dcpga9jWvHijFmAIEbM86EhOEBd6QA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681859641; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vJRtmDdJD+dthwNGHQ7EX9y9DTn8PVAc2I0uFv7UT7I=; b=uyYRahxlXAZtdafmu8TkZkJNSmJCSXxKwaJM68zQH89dtYpTev8DAIJEN90W78XTGbmBT+ mQZCWIiYYJV5bMUPNRkvt9fxGU3PlRHbKss48zdYTPTlmjVlRyeJ1qs1Hgj2c8GRZX0cnm 5Z6x/ELW2oIi90iIFIwLCnd76pWPtFFzKKSz9kPchfyW3uBSKC8MmZv47woXuD82vdUYBh HMDWJ+kTaZqsreH+F7XUBm3JUcT7NLtfD43a/I+5MFHVDYRhncApS+ma6QrSv/gAMkgBHk jCRj38VzFAutmQLmeOvaAZdgrZQeDSoWTgJQkbHV+TT3iUwrGEsrBZFTYd29Ug== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681859641; a=rsa-sha256; cv=none; b=IduRckJFAaztwrrdjMLasUFKi0u24fNz0hwyShwfBdu7uHpaq85HmgcKj4TP/s1P2BPkQN zJpOifos4gjRgb73eKcJk4KdradzXIHUcpHaZpVrjpaELtCjvFNBpiwqROC73i4BYywjZU EiJJAvmQXzyi3ZToGG2oh/arKbp0vNLxEMw3cOT8BwsmpZkbsVWUeh6jqKEH51t671iNsa C/itJa8X4qkPtA4DOi0hjtG90rnJL07M0F31fS1hrJrUheNeA2ObUx2Ru+4lgVrf6RAXLz 8t2/+DtVaEbqOskqeUBYgyjKdhYK52COlJ9YDEaaNAsHpJJnwKBf4CyLsb0pxA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Q1KVc50gGzWhq; Tue, 18 Apr 2023 23:14:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33INE0ID095389; Tue, 18 Apr 2023 23:14:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33INE0eh095388; Tue, 18 Apr 2023 23:14:00 GMT (envelope-from git) Date: Tue, 18 Apr 2023 23:14:00 GMT Message-Id: <202304182314.33INE0eh095388@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kirk McKusick Subject: git: 18746531a881 - main - Bug fixes for fsck_ffs(8). List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mckusick X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 18746531a881356ed24b6ef2fdc9e50707642163 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mckusick: URL: https://cgit.FreeBSD.org/src/commit/?id=18746531a881356ed24b6ef2fdc9e50707642163 commit 18746531a881356ed24b6ef2fdc9e50707642163 Author: Kirk McKusick AuthorDate: 2023-04-18 06:03:30 +0000 Commit: Kirk McKusick CommitDate: 2023-04-18 23:13:26 +0000 Bug fixes for fsck_ffs(8). Increment a reference count when returning a zero'ed out buffer after a failed read. Zero out a structure before using it. Only dirty a buffer that has been modified. Submitted by: Chuck Silvers Sponsored by: Netflix MFC after: 1 week --- sbin/fsck_ffs/fsutil.c | 4 +++- sbin/fsck_ffs/inode.c | 10 ++++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/sbin/fsck_ffs/fsutil.c b/sbin/fsck_ffs/fsutil.c index d58527231240..2b915d28aa26 100644 --- a/sbin/fsck_ffs/fsutil.c +++ b/sbin/fsck_ffs/fsutil.c @@ -320,8 +320,10 @@ getdatablk(ufs2_daddr_t blkno, long size, int type) * Skip check for inodes because chkrange() considers * metadata areas invalid to write data. */ - if (type != BT_INODES && chkrange(blkno, size / sblock.fs_fsize)) + if (type != BT_INODES && chkrange(blkno, size / sblock.fs_fsize)) { + failedbuf.b_refcnt++; return (&failedbuf); + } bhdp = &bufhashhd[HASH(blkno)]; LIST_FOREACH(bp, bhdp, b_hash) if (bp->b_bno == fsbtodb(&sblock, blkno)) { diff --git a/sbin/fsck_ffs/inode.c b/sbin/fsck_ffs/inode.c index a46fea0607a0..37b0f9ebc1b1 100644 --- a/sbin/fsck_ffs/inode.c +++ b/sbin/fsck_ffs/inode.c @@ -747,6 +747,7 @@ snapremove(ino_t inum) bzero(&snaplist[i - 1], sizeof(struct inode)); snapcnt--; } + memset(&idesc, 0, sizeof(struct inodesc)); idesc.id_type = SNAP; idesc.id_func = snapclean; idesc.id_number = inum; @@ -767,14 +768,15 @@ snapclean(struct inodesc *idesc) if (blkno == 0) return (KEEPON); - bp = idesc->id_bp; dp = idesc->id_dp; if (blkno == BLK_NOCOPY || blkno == BLK_SNAP) { - if (idesc->id_lbn < UFS_NDADDR) + if (idesc->id_lbn < UFS_NDADDR) { DIP_SET(dp, di_db[idesc->id_lbn], 0); - else + } else { + bp = idesc->id_bp; IBLK_SET(bp, bp->b_index, 0); - dirty(bp); + dirty(bp); + } } return (KEEPON); }