From nobody Wed Jun 07 23:15:40 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 4Qc39S50Kpz4bhlk; Wed, 7 Jun 2023 23:15:40 +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 4Qc39S31ncz3DHZ; Wed, 7 Jun 2023 23:15:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1686179740; 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=m/H9HTceWSS15lPHRie91DBOC58jmt/Mon+xjvMrdLQ=; b=RwALpXiy+1SZ43uag8ruh5Iy25WaryEmSstzShUj91G6meMcFgYdw/3ArNelVkrRQgbGPh p3v0PbjkKXnIxOWTigM6R+EJoquOJ3ltssCLRzLv1MhUaeLJwl/dGfesZYp8R63Chtf2zN NcE2XD1oVqKQ8Z72dt0mK1DfNkAMsW7x0PwFXhLZ9TJyyxrSz6xiEKW7A0Y0+CKGiI2uwY izP+gv1XEo4L6fg11zs+LIk3Vvy4zMAVVQx+ADBFaf9z1G1pJFO8T8Zda+rftb/DrDyU9E fAP6Tzl2272c6uNAVVSINr1CP/mWWDHVDszZrMsC5LzOuSWtU0PFp4yOtRlK1g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1686179740; 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=m/H9HTceWSS15lPHRie91DBOC58jmt/Mon+xjvMrdLQ=; b=l1DCB0JBzXl7UyQ0CdzkEgQ2178k6OId8j4CReFd5fGsTP21GPzbmQLQLAMHsXPwp5DRyT /XK3u7ivoVepTb9RCMo2ZmG00sLeyxHTk4KsIj9zKqw1bZBPoouJqJYGYwPDLgHp/x7Fmt JZtSsD82Vlp2iNdD96UY21dE52c2FXFf8laM0W2dhpQoZ4X3x6hDnmImOLFHzWBe2O0PLb Um0WUGlEwFN7NUrrI463XFBPS7vq7+4kwUNWYBEVeKB4iD4jflWhuAZMGhq1GnZ5J/dH76 EmdKw8NSMGPKWu89bBxJJCPzSSbSiIevoteDy8Jf2QN1EpKvov0B0Ew1jpwdpQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1686179740; a=rsa-sha256; cv=none; b=QQ/R8L2C2r82nbZICsQBq72xP6Wz53GLO8h74o2hWEGkkefIMTqO+Rb/fDdnx7UP1mAliq qTWzzWajo+YjrMyjgTBv3Z4OEOiJdOFMfSgHBoL9d+XB98VJQetFjNRJlr/mD40CP00tcw IuTpnWfMIal2gU4yITn0TvBBLuBwdaLRgVaEOqq+PDWfq1NZNnPEFb+I1F+vCj/EKzVyEr X9JhzZNf1XRBsE31Xukkqc1rm8FMYfhC7LBKusuLpKOchAFl6ccv3s4iACib/XTfHKDDO8 Jm8YTJzmhgqfp7NKFnHm6t7MrKVxms1kGqunmKLHTITQ107xPd/lzuvu8Fndiw== 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 4Qc39S26P6zVx0; Wed, 7 Jun 2023 23:15:40 +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 357NFeha048486; Wed, 7 Jun 2023 23:15:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 357NFert048485; Wed, 7 Jun 2023 23:15:40 GMT (envelope-from git) Date: Wed, 7 Jun 2023 23:15:40 GMT Message-Id: <202306072315.357NFert048485@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: a4bea5c479d8 - 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: a4bea5c479d84d5fb10c6d78abce504253fe8e1d Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by mckusick: URL: https://cgit.FreeBSD.org/src/commit/?id=a4bea5c479d84d5fb10c6d78abce504253fe8e1d commit a4bea5c479d84d5fb10c6d78abce504253fe8e1d Author: Kirk McKusick AuthorDate: 2023-05-29 21:58:20 +0000 Commit: Kirk McKusick CommitDate: 2023-06-07 22:56:12 +0000 Fix a bug in fsck_ffs(8) triggered by corrupted filesystems. Reported-by: Robert Morris PR: 271414 Sponsored-by: The FreeBSD Foundation (cherry picked from commit 6a71277c3037df2c3a70464c2e2bf20dec2c128a) --- sbin/fsck_ffs/suj.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/sbin/fsck_ffs/suj.c b/sbin/fsck_ffs/suj.c index 5a09943406c8..d1b6d8530ce6 100644 --- a/sbin/fsck_ffs/suj.c +++ b/sbin/fsck_ffs/suj.c @@ -2375,7 +2375,7 @@ suj_check(const char *filesys) { struct inodesc idesc; struct csum *cgsum; - union dinode *jip; + union dinode *dp, *jip; struct inode ip; uint64_t blocks; int i, retval; @@ -2417,7 +2417,17 @@ suj_check(const char *filesys) idesc.id_func = findino; idesc.id_name = SUJ_FILE; ginode(UFS_ROOTINO, &ip); - if ((ckinode(ip.i_dp, &idesc) & FOUND) == FOUND) { + dp = ip.i_dp; + if ((DIP(dp, di_mode) & IFMT) != IFDIR) { + irelse(&ip); + err_suj("root inode is not a directory\n"); + } + if (DIP(dp, di_size) < 0 || DIP(dp, di_size) > MAXDIRSIZE) { + irelse(&ip); + err_suj("negative or oversized root directory %jd\n", + (uintmax_t)DIP(dp, di_size)); + } + if ((ckinode(dp, &idesc) & FOUND) == FOUND) { sujino = idesc.id_parent; irelse(&ip); } else {