From nobody Sat Dec 04 22:34:21 2021 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 1294C18297E7; Sat, 4 Dec 2021 22:34:22 +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 4J64Hd4fRCz4SL1; Sat, 4 Dec 2021 22:34:21 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 715364C84; Sat, 4 Dec 2021 22:34:21 +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 1B4MYLSc020591; Sat, 4 Dec 2021 22:34:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1B4MYLYa020590; Sat, 4 Dec 2021 22:34:21 GMT (envelope-from git) Date: Sat, 4 Dec 2021 22:34:21 GMT Message-Id: <202112042234.1B4MYLYa020590@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Neel Chauhan Subject: git: c0e1884b11c0 - stable/13 - ext2: Check for e2fs_first_dblock in ext2_compute_sb_data() 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: nc X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: c0e1884b11c0f86cd7bec28b03b9d6a3a4a45c3b Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1638657261; 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=pBALF+d6dae595C+ypNecBlRlmSc7IvCc6ZgxEnpZKg=; b=unAC9in6uqryIE7bYUz9mJY2b1SxSd6QSeshhvEvzbtG2Eyvg4tXrghWI4OW7GHo819UMj hNeIcA21HK3JPzwfiYYG95HB9/QsQdo0EBXNNB8NyC8I97EDzEkw9YUedJDNu1VyaGTOv6 9rruN68rsfE/fBl3/9xof7u6CCdD3nZfH5ASFfSzIYmERABzEzmXfRTtDTU9p2ozzJmbk2 DS6l6D9KLeTHOfDxe59RjR8IooFxFYQzJ9SkJBukmACHj2usdwpZTulhJe30NDmc/WC0XM FKoO64lPo/jCLCt0TKP3DLTealGuIVYsaIk4+TFZMNCBRkbrmH4+zuYM1hpClg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1638657261; a=rsa-sha256; cv=none; b=xTtdP1lwTG/pVZ4IwbJ6JGgOVkUHIchD8MrVRZtQ7ib11NHFc4yCHBj3dYMWryCl950kp5 P+pCbu7jksyCTqYuS7mHp+58mXiqNhpKpvHd+phWY7n26fF6+wq+cvph0AET8FvwV4WCN9 N8Tv6c2dZZZoRfHMPrnOAJaLejIHmktiNSk2hyoeEJHKDF4Bil+Dcye1TNg5X65yxNlojc 6YhaVW+gbi3o2HdrdRcA7XKfmtUBM0Wm7vZTh3Dtqydiez2MYapAYR6TWfLIMQefaLmxdE wnzyNE2e57EZK/WKYE28CW5TxXquO9Z0HwXwYKQ0oEepORrFnlqsHwUbMJScvQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by nc (ports committer): URL: https://cgit.FreeBSD.org/src/commit/?id=c0e1884b11c0f86cd7bec28b03b9d6a3a4a45c3b commit c0e1884b11c0f86cd7bec28b03b9d6a3a4a45c3b Author: Neel Chauhan AuthorDate: 2021-11-16 22:59:26 +0000 Commit: Neel Chauhan CommitDate: 2021-12-04 22:34:20 +0000 ext2: Check for e2fs_first_dblock in ext2_compute_sb_data() This prevents a kernel panic on a damaged ext2 superblock. PR: 259107 Reported by: Robert Morris Differential Revision: https://reviews.freebsd.org/D33029 (cherry picked from commit 3dd3a395ba975d0fbe13320e6e69fb85b037da5e) --- sys/fs/ext2fs/ext2_vfsops.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/sys/fs/ext2fs/ext2_vfsops.c b/sys/fs/ext2fs/ext2_vfsops.c index 5bc2e975d310..74a7a08128b4 100644 --- a/sys/fs/ext2fs/ext2_vfsops.c +++ b/sys/fs/ext2fs/ext2_vfsops.c @@ -465,6 +465,13 @@ ext2_compute_sb_data(struct vnode *devvp, struct ext2fs *es, int g_count = 0; int error; + /* Check if first dblock is valid */ + if (fs->e2fs->e2fs_bcount >= 1024 && fs->e2fs->e2fs_first_dblock) { + SDT_PROBE1(ext2fs, , vfsops, ext2_compute_sb_data_error, + "first dblock is invalid"); + return (EINVAL); + } + /* Check checksum features */ if (EXT2_HAS_RO_COMPAT_FEATURE(fs, EXT2F_ROCOMPAT_GDT_CSUM) && EXT2_HAS_RO_COMPAT_FEATURE(fs, EXT2F_ROCOMPAT_METADATA_CKSUM)) { @@ -611,7 +618,8 @@ ext2_compute_sb_data(struct vnode *devvp, struct ext2fs *es, return (EINVAL); } - if (le32toh(es->e2fs_first_dblock) >= fs->e2fs_bcount) { + if (le32toh(es->e2fs_first_dblock) != (fs->e2fs_bsize > 1024 ? 0 : 1) || + le32toh(es->e2fs_first_dblock) >= fs->e2fs_bcount) { SDT_PROBE1(ext2fs, , vfsops, ext2_compute_sb_data_error, "first data block out of range"); return (EINVAL);