From owner-svn-src-head@freebsd.org Fri Apr 10 23:49:35 2020 Return-Path: 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 4028527E544; Fri, 10 Apr 2020 23:49:35 +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 48zZVl0bssz3Jyh; Fri, 10 Apr 2020 23:49:35 +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 E53D669B1; Fri, 10 Apr 2020 23:49:34 +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 03ANnYYl078543; Fri, 10 Apr 2020 23:49:34 GMT (envelope-from mckusick@FreeBSD.org) Received: (from mckusick@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 03ANnYpK078542; Fri, 10 Apr 2020 23:49:34 GMT (envelope-from mckusick@FreeBSD.org) Message-Id: <202004102349.03ANnYpK078542@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mckusick set sender to mckusick@FreeBSD.org using -f From: Kirk McKusick Date: Fri, 10 Apr 2020 23:49:34 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r359789 - 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: 359789 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 10 Apr 2020 23:49:35 -0000 Author: mckusick Date: Fri Apr 10 23:49:34 2020 New Revision: 359789 URL: https://svnweb.freebsd.org/changeset/base/359789 Log: Add an inode check-hash verification when running the journalled soft update recovery code with the debugging (-d) option. As inode check-hash was first introduced to UFS in FreeBSD 13, there is no need to MFC this commit. Reported by: Chuck Silvers Sponsored by: Netflix Modified: head/sbin/fsck_ffs/suj.c Modified: head/sbin/fsck_ffs/suj.c ============================================================================== --- head/sbin/fsck_ffs/suj.c Fri Apr 10 23:13:29 2020 (r359788) +++ head/sbin/fsck_ffs/suj.c Fri Apr 10 23:49:34 2020 (r359789) @@ -109,6 +109,7 @@ struct ino_blk { LIST_ENTRY(ino_blk) ib_next; uint8_t *ib_buf; int ib_dirty; + ino_t ib_startinginum; ufs2_daddr_t ib_blk; }; LIST_HEAD(iblkhd, ino_blk); @@ -157,6 +158,7 @@ static void ino_adjust(struct suj_ino *); static void ino_build(struct suj_ino *); static int blk_isfree(ufs2_daddr_t); static void initsuj(void); +static void ino_dirty(ino_t); static void * errmalloc(size_t n) @@ -394,6 +396,7 @@ ino_read(ino_t ino) struct iblkhd *hd; struct suj_cg *sc; ufs2_daddr_t blk; + union dinode *dp; int off; blk = ino_to_fsba(fs, ino); @@ -412,6 +415,7 @@ ino_read(ino_t ino) bzero(iblk, sizeof(*iblk)); iblk->ib_buf = errmalloc(fs->fs_bsize); iblk->ib_blk = blk; + iblk->ib_startinginum = rounddown(ino, INOPB(fs)); LIST_INSERT_HEAD(hd, iblk, ib_next); if (bread(&disk, fsbtodb(fs, blk), iblk->ib_buf, fs->fs_bsize) == -1) err_suj("Failed to read inode block %jd\n", blk); @@ -420,8 +424,18 @@ found: off = ino_to_fsbo(fs, ino); if (fs->fs_magic == FS_UFS1_MAGIC) return (union dinode *)&((struct ufs1_dinode *)iblk->ib_buf)[off]; - else - return (union dinode *)&((struct ufs2_dinode *)iblk->ib_buf)[off]; + dp = (union dinode *)&((struct ufs2_dinode *)iblk->ib_buf)[off]; + if (debug && + ffs_verify_dinode_ckhash(fs, (struct ufs2_dinode *)dp) != 0) { + pwarn("ino_read: INODE CHECK-HASH FAILED"); + prtinode(ino, dp); + if (preen || reply("FIX") != 0) { + if (preen) + printf(" (FIXED)\n"); + ino_dirty(ino); + } + } + return (dp); } static void @@ -464,9 +478,25 @@ ino_dirty(ino_t ino) static void iblk_write(struct ino_blk *iblk) { + struct ufs2_dinode *dp; + int i; if (iblk->ib_dirty == 0) return; + if (debug && fs->fs_magic == FS_UFS2_MAGIC) { + dp = (struct ufs2_dinode *)iblk->ib_buf; + for (i = 0; i < INOPB(fs); dp++, i++) { + if (ffs_verify_dinode_ckhash(fs, dp) == 0) + continue; + pwarn("iblk_write: INODE CHECK-HASH FAILED"); + prtinode(iblk->ib_startinginum + i, (union dinode *)dp); + if (preen || reply("FIX") != 0) { + if (preen) + printf(" (FIXED)\n"); + ino_dirty(iblk->ib_startinginum + i); + } + } + } if (bwrite(&disk, fsbtodb(fs, iblk->ib_blk), iblk->ib_buf, fs->fs_bsize) == -1) err_suj("Failed to write inode block %jd\n", iblk->ib_blk);