From nobody Wed Jun 07 23:15:38 2023 X-Original-To: dev-commits-src-branches@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 4Qc39Q2BsTz4bhjr; Wed, 7 Jun 2023 23:15:38 +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 4Qc39Q1kSQz3D89; Wed, 7 Jun 2023 23:15:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1686179738; 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=5JC9sIryRifeboHj4oaY8NMk+i7nJMk7GbnjWKKYOPc=; b=xpWqiYAS1QF+jvdkUCBR1nWS7otS7JQnQ8FlqsyzqEVHHScgYZITMcFZy6Pd3pbD5OC38Y BHrauVAxm7FM/MTVAkU22Ocuyk3vm9GvLFjLfk1B0VkzYtwSQeI0cR+vrirAATC2RJ+mCj ACgnanSuKf6cRadm1GkGYXvzWPwbVa4ndOuWaM0nqTjT4ExcID81EW0mqnUw1ZxK3ylbQ4 al2SmcZQVM9uWhoXxzYFwqb22PDxQ19/iSOySojRmmRKycuYN9WpSxhAgfgrLrYRdzpUfh WugmN4C71WR3LPZDhBAj1xpEBAUgTBK9p9VXYpCRzSHsoQUx2ifDJZ5G+2zvhw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1686179738; 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=5JC9sIryRifeboHj4oaY8NMk+i7nJMk7GbnjWKKYOPc=; b=eavbM3iEUYF5JjEoHMjmTp2P1G6J+mCLsNXaAAKjjEWDpMXVmNaMbOL817KV2Z5UyTZNEq 1NG4I7zQGhSZKD4QXBc5x7E4UTdha7nDS/qDRfAAXqbKDPfZ4dUgmFnBvciw1BPC/0XPqb SEdOzJtRobeMc7xOQxcb3p5d05HQIYHMeWcV3rotTFTtiPVEEPR5Q4s2Eb9j5S1HDUrX2K OnpWZD8lUu5Wg8CcmXndd9Np9wTiwxiIdWbQxF2OhUHuDS+yDNP71d6apDJrw5J3tWhWfd TfK0uRnxLI+Fgy1iuqXAoDglPgZcePBXRM0+Y0T904q15ctLHGoVmRQz91ixVw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1686179738; a=rsa-sha256; cv=none; b=ObgEG7uALBVfNh7iz96EsmPe83KLA6GqNWjGL66H7PvbqNzDFzLHYtU/1167EMUWWvo0uG PC8WzyulLzXEshb/3z8kXJGvaxb99lKlLsf9zRAzhnwsP9z4sVJnZ7d87+ACSZUcyxd0Wn gUBaTakhuyIAD+bJbip2e6F4zTIhNxg6Jb0kvhZQmeiwl/sufda6pFFTqxbNkJkNM9JZgr C3qrDRTyZfBAEJyClWkmiHo84GPGllvrwnHco81bExGppnzoBjeYACE5l9zmvKcCmRabYY QNcPYmris/reKRbQKgZyJCFJBKonXK6S0rN/i7lhOvNrv3EDGoHOzpMCLI+7yQ== 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 4Qc39Q0r4szWGK; Wed, 7 Jun 2023 23:15:38 +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 357NFcO2048441; Wed, 7 Jun 2023 23:15:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 357NFcgR048440; Wed, 7 Jun 2023 23:15:38 GMT (envelope-from git) Date: Wed, 7 Jun 2023 23:15:38 GMT Message-Id: <202306072315.357NFcgR048440@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: da8749afdca8 - stable/13 - Fix a bug in fsck_ffs(8) triggered by corrupted filesystems. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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: da8749afdca81a435b76f8f54e7642e5ee232958 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by mckusick: URL: https://cgit.FreeBSD.org/src/commit/?id=da8749afdca81a435b76f8f54e7642e5ee232958 commit da8749afdca81a435b76f8f54e7642e5ee232958 Author: Kirk McKusick AuthorDate: 2023-05-28 22:23:16 +0000 Commit: Kirk McKusick CommitDate: 2023-06-07 22:48:47 +0000 Fix a bug in fsck_ffs(8) triggered by corrupted filesystems. Reported-by: Robert Morris PR: 271383 Sponsored-by: The FreeBSD Foundation (cherry picked from commit b796bfce48698449470b751de6b0d96ae7047202) --- sbin/fsck_ffs/suj.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sbin/fsck_ffs/suj.c b/sbin/fsck_ffs/suj.c index cbb6e597dfee..5a09943406c8 100644 --- a/sbin/fsck_ffs/suj.c +++ b/sbin/fsck_ffs/suj.c @@ -734,7 +734,7 @@ indir_visit(ino_t ino, ufs_lbn_t lbn, ufs2_daddr_t blk, uint64_t *frags, lbnadd *= NINDIR(fs); bp = getdatablk(blk, fs->fs_bsize, BT_LEVEL1 + level); if (bp->b_errs != 0) - err_suj("indir_visit: UNRECOVERABLE I/O ERROR"); + err_suj("indir_visit: UNRECOVERABLE I/O ERROR\n"); for (i = 0; i < NINDIR(fs); i++) { if ((nblk = IBLK(bp, i)) == 0) continue; @@ -1916,6 +1916,9 @@ blk_build(struct jblkrec *blkrec) blk = blknum(fs, blkrec->jb_blkno); frag = fragnum(fs, blkrec->jb_blkno); + if (blkrec->jb_blkno < 0 || blk + fs->fs_frag - frag > fs->fs_size) + err_suj("Out-of-bounds journal block number %jd\n", + blkrec->jb_blkno); sblk = blk_lookup(blk, 1); /* * Rewrite the record using oldfrags to indicate the offset into