From nobody Sun Dec 4 06:10:57 2022 X-Original-To: dev-commits-src-all@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 4NPxBT2Kbvz4jSQ2; Sun, 4 Dec 2022 06:10:57 +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 4NPxBT1pJhz4V5r; Sun, 4 Dec 2022 06:10:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1670134257; 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=yKyCrvCmH1JoHykjbDv+9oLNfClwfSx5hjY/Tt3J8I4=; b=PEtDj9u2zb1YuAqZR6V4lns1kuretkQaQhGwTsMSYS+dFIuqFbgnpmH+NjDMWa+MqqyE8O x5rLkOlSPQhxGRcxxblLvLW+7jZOBjI7ISBcogdPzXh1+F2BF2/PQrIaHzhHq85BqjZkp5 mjlO1jqn2rl08vCZGYvzB3QoKb6qdbugB+F25k8kXUemyT0N9KlH+SxuhIPGMKKlv7ke7s 45sNXI2KRgT4CPFSaD6fH3ErvWAFuFKwpjaXIiUevH5yA86YDUMt+HZ4omhMF7Y18ZTEHs yBZ1qEQZuLVTGVCzT9aEvKYaGMAlyHEZ2tg4L9S3q2CKdIr+sxXUvAt6R10tXA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1670134257; 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=yKyCrvCmH1JoHykjbDv+9oLNfClwfSx5hjY/Tt3J8I4=; b=AwtVp637PIiwmwR7H/Hz5hWvEFYhUVEQnvoA3ZroZxgcv7hLE98LVQVn+Vd7tsFHjSU4YI +3kalwaTKyCQEfCyhsMMITHM99uLCbzQheyYcd9in3c2QryfRoE4p5lXWW284+yo6/sUn/ aqqBZ3QohA8BjcyG4qUOTiPy00846np2pV0KJNHFcDDSvcKFbiWShTaSvXgKQ0INirDoyO S1nPPRdpQpsA/99USmGGygVH3gTyzgHYmAavb+EkYOBIfSLgeB/NvdO+j2jJywvUzw/82F Ox7TdbUkJJRuaSzfdB0E8EhuuLqzJtWH82k9o9iuvoMZtWFte1PqUM/1o18KFQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1670134257; a=rsa-sha256; cv=none; b=PR/tTsw9+bm4k14DuR6As9B+JN1Z6a0LOs2dE2RH4zEVl5Ya0/fZL2YtnsXrXjSGDv5uVe OMygSJ2mYxmWCkstDN6vptcxAy25jnP3Mv33gX0e6hzn28CnFELqugxmWl5+PMs/YVsM/v iSlhxTq7DW8cZG5XkZ7cz/oEjkPFkSF7pxcLk2btB59SYHUJ5iw8rhJdtcBoUwZJ8NOK/I aRotQeXWPn0eSiEzKu0/4B9henp154RQARtCle3LsyfejB1Uco0Rol7wnNYFw0ibN5m29N mEjmS4PNzFmNEWvwkQQetHKCeOMOgIWvZhQwPcDu5cKYxYmEgrPe05Fa0R827w== 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 4NPxBT0vFMz1Mqh; Sun, 4 Dec 2022 06:10:57 +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 2B46AvGN010604; Sun, 4 Dec 2022 06:10:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2B46Av6r010603; Sun, 4 Dec 2022 06:10:57 GMT (envelope-from git) Date: Sun, 4 Dec 2022 06:10:57 GMT Message-Id: <202212040610.2B46Av6r010603@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kirk McKusick Subject: git: b2af9ad17124 - stable/13 - Correctness cleanups in fsck_ffs(8). List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/stable/13 X-Git-Reftype: branch X-Git-Commit: b2af9ad171243a897a341ec3aefc5f2ea099e336 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by mckusick: URL: https://cgit.FreeBSD.org/src/commit/?id=b2af9ad171243a897a341ec3aefc5f2ea099e336 commit b2af9ad171243a897a341ec3aefc5f2ea099e336 Author: Kirk McKusick AuthorDate: 2022-08-13 20:27:37 +0000 Commit: Kirk McKusick CommitDate: 2022-12-04 05:46:51 +0000 Correctness cleanups in fsck_ffs(8). (cherry picked from commit 6e821c35d68d4041640b27419837464ffab65cff) Sponsored by: The FreeBSD Foundation --- sbin/fsck_ffs/inode.c | 3 +++ sbin/fsck_ffs/setup.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/sbin/fsck_ffs/inode.c b/sbin/fsck_ffs/inode.c index dafc99bd92da..ccfe8782ac88 100644 --- a/sbin/fsck_ffs/inode.c +++ b/sbin/fsck_ffs/inode.c @@ -474,6 +474,9 @@ void irelse(struct inode *ip) { + /* Check for failed inode read */ + if (ip->i_bp == NULL) + return; if (ip->i_bp->b_refcnt <= 0) pfatal("irelse: releasing unreferenced ino %ju\n", (uintmax_t) ip->i_number); diff --git a/sbin/fsck_ffs/setup.c b/sbin/fsck_ffs/setup.c index 14b34962d3fe..05c044395436 100644 --- a/sbin/fsck_ffs/setup.c +++ b/sbin/fsck_ffs/setup.c @@ -174,6 +174,7 @@ setup(char *dev) /* * allocate and initialize the necessary maps */ + bufinit(); bmapsize = roundup(howmany(maxfsblock, CHAR_BIT), sizeof(short)); blockmap = Calloc((unsigned)bmapsize, sizeof (char)); if (blockmap == NULL) { @@ -198,7 +199,6 @@ setup(char *dev) (uintmax_t)numdirs * sizeof(struct inoinfo *)); goto badsb; } - bufinit(); if (sblock.fs_flags & FS_DOSOFTDEP) usedsoftdep = 1; else