From nobody Fri May 19 23:54:26 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 4QNNwz20hmz4CX0C; Fri, 19 May 2023 23:54:27 +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 4QNNwz0Gcwz3vSZ; Fri, 19 May 2023 23:54:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684540467; 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=ecJa1nLrlDj3iC9/aIDXaBVvs06LehMgQXBLme2MGt4=; b=Osbd6Eh8eJ4h7sAfCI1DRc7BSV6QTgRIgsL9NppsXaKqkVl1QgGs0YIS7QlrAEH4X3k552 rNgOh5qrS1n1NZ6ftWYUx65KkcTNGoi1UMPvQGNK++3XrZbxpw9T8jf1TdbmC3duoyQnvw aUgXSJjPW1F1jfznt6LzoJsC7VnLG7sx0aPDYfXxrXAK9Qbz2beWjcnSM+oEgqvbOT3MCX Imd/6DwYDOYhQ1WVf9cjL2Tcp9hnS7r93yoL2MC2gKMBMEWq5QvJtJBuq0rnrUdoMYth/p wzVpewUuR2/UtoSZMxpdK7LVSBAoa6Ywfuj29EJjBjCBpF2rK3YwJG7+ATdEzA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684540467; 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=ecJa1nLrlDj3iC9/aIDXaBVvs06LehMgQXBLme2MGt4=; b=PiU2veapcN3nO3ZfPYkgJCA9dePMfRAZKjoIQ2o+5Dq7Vh2L4YY914uVAg26gBK4/aWCdE EbJVyL0rM2xKu6FDopEG5Cal8NGSddAsWM7Lzzwr3Py6uCCH0lkD4Nsnb0MZ8RsgGR8u4f G6AuFuMUdTSxok4GkyV8J2F3QlSdNTNH2hQ3q2CIw/OerbSEiJZNLrpjuUfC05sNE15lfW ywDoyyU/1yo+8Aa88LuV9ksuFz8+GHpekAXPWjEdyL+0IjM5eDDojUbZE6azJ/h31yZo0q kMCiTNEsZTlV5c4pm79GBmFS2pya66ZV6OMX0gM5Fp6cFi9QTJuxv7f9NYgD0Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1684540467; a=rsa-sha256; cv=none; b=EjBpyuhvTHzVhQsjUUrhT/bcSsLFvk4NUNXWbPurDtlwbGfiynYWCMKF3iEba7qhooQrVj uGB0vM3Of0BDiiBxTQIMpaeO7pLJyNpjyIfHyFDqgn22Lda85rCdWUQo9/kDfi2WtowHKG SDe5XPiN8IPiFcnEVFVQA5qPYq9AE1fwACASR8PWlxO9Lw5yPgOOClHSMgvc3L1vLqwUlB +3EYZyE2ipWNyiBk5+ueCZAxQlGhqmdMu1LIIZ1KuWeFb/RcttVpMczN3FQFGzA2xnYSDm +ds7UQ4TGPiQrepQye2iDCBu+LYzCwsH38374TOC4oz0OgKX8NCmZOR7IHe1Ag== 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 4QNNwy6V9CznPm; Fri, 19 May 2023 23:54:26 +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 34JNsQ01064830; Fri, 19 May 2023 23:54:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34JNsQb3064829; Fri, 19 May 2023 23:54:26 GMT (envelope-from git) Date: Fri, 19 May 2023 23:54:26 GMT Message-Id: <202305192354.34JNsQb3064829@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: 8e0b31c791cf - stable/13 - Fix off-by-one error in fsck_ffs(8) chkrange() block-number check. 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: 8e0b31c791cf1da6d9fda3da9999e66a5e162230 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by mckusick: URL: https://cgit.FreeBSD.org/src/commit/?id=8e0b31c791cf1da6d9fda3da9999e66a5e162230 commit 8e0b31c791cf1da6d9fda3da9999e66a5e162230 Author: Kirk McKusick AuthorDate: 2023-05-09 20:08:10 +0000 Commit: Kirk McKusick CommitDate: 2023-05-19 23:02:21 +0000 Fix off-by-one error in fsck_ffs(8) chkrange() block-number check. PR: 271289 (cherry picked from commit b3fe5d932264445cbf9a1c4eab01afb6179b499b) --- sbin/fsck_ffs/inode.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sbin/fsck_ffs/inode.c b/sbin/fsck_ffs/inode.c index 04891447254e..00a60157138c 100644 --- a/sbin/fsck_ffs/inode.c +++ b/sbin/fsck_ffs/inode.c @@ -381,8 +381,8 @@ chkrange(ufs2_daddr_t blk, int cnt) { int c; - if (cnt <= 0 || blk <= 0 || blk > maxfsblock || - cnt - 1 > maxfsblock - blk) { + if (cnt <= 0 || blk <= 0 || blk >= maxfsblock || + cnt > maxfsblock - blk) { if (debug) printf("out of range: blk %ld, offset %i, size %d\n", (long)blk, (int)fragnum(&sblock, blk), cnt);