From nobody Wed Apr 1 22:34:16 2026 Received: from mail-pj1-f52.google.com (mail-pj1-f52.google.com [209.85.216.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 232533C8737 for ; Wed, 1 Apr 2026 09:23:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.52 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775035401; cv=none; b=UmQt2s2jZOSZzXYbezuL1CQYnIDTCJlow7u0pYHhWLBjoZ19fk1FIK1np7J39nQxniBmUe0t/7kMLG6Du84apGYHaf7HQXc4BGXHoXxfZsqodmo7o+5EYzApzNM5mxKtNzpoO6gjY5hLqs+weIzztmLYv2UCwLEoxPq1vjc1h1c= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775035401; c=relaxed/simple; bh=Iyb08bR1EKI5CR+3yx4hDlBhnzcgq3vDsYkqTe7ODpk=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=grF+K5th+nc4Odm53Dm/Yk2FFS2c71ZFOGqgObPEo5fEL5M+3wDP0bq/AcY4Q9KzD++e2hWNrhcbG9Kz4DTj8DD/SS2VRcre5U1qRdDFFpNbuKboRWVxvYgBQG+FyJMXuEX3M0GGUVHUUua2BR4YfRkjD3hq0JguTCwiUzqt3BI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=o5UEFkd8; arc=none smtp.client-ip=209.85.216.52 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="o5UEFkd8" Received: by mail-pj1-f52.google.com with SMTP id 98e67ed59e1d1-35d9827661bso2137771a91.3 for ; Wed, 01 Apr 2026 02:23:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1775035399; x=1775640199; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=7aS3Bgq6XLNZ+UJEINrYzINd5Eyqo5xjkhdUwm3+Orc=; b=o5UEFkd8gjp+vkC2Aa5+XpCQs3YGxIMBQhaIDRV5WHl4fkn1gD8TRt4mwH+3bMXlT8 gfjqg+HUgLJbDUTF2UMWqx+tnv3L9bTypWkVtpqkgG3umAeS9wijm12guLlPM/xSm8Cp bZkk0q31WSW0lSRFI+yz4bItAtTYOPJx5pJRpERqwG5781S6rn4GQ+3M716cnT4Fdp3W WUx9hVgYG12cfbHituW7FEYmuwYx6/wZF+xmUSnneoGtzq+mtqpwiz/KOLpF8RYA+YRD 8EKuGsyEZOz12FrwpvQ/h4xCu4I36xcKmROeZ8CXbts/3WsvCeSnHJXkpM3DLo1afW37 37ig== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775035399; x=1775640199; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=7aS3Bgq6XLNZ+UJEINrYzINd5Eyqo5xjkhdUwm3+Orc=; b=L07irmN7CYmQQ7/dpQG9qZDgSd3DTxdMTfnwMDHjC14YJjOWL7ICMzarjsT+TIprb0 V/rxIOZoIwb3AbTLw5FxZSKUQFLRdkrlKI7wIz7pXTSA8u2a+2lZeW7O19M2pzDfZIVb mEklFJkqSmzovuma3mEY+36Vzin+XaAoTitUp7A/Il6UUarS0T4ZI3Lp7qzGo8X+tiBm 8S/KgBkg0VgLg4SxlPPJUpqZMDFSRNNTn8UGvdGklMF9IkRT9p09yOh6QdcIU3mvy2Fk /Prfu23rDHSJF/Z3kUJkHrTpehA8MocXZRasGsTgC6i7cZGrpqpmv23F7UoLU8wXBx6u LE8Q== X-Forwarded-Encrypted: i=1; AJvYcCXPcaLay/mbm2XoUkCpij9fAtuO47lA5Rjv65m80M269uLy9H0gDnYQAIxiBdOGcm0o09o/jCBaNZwMy1A=@vger.kernel.org X-Gm-Message-State: AOJu0YxF+qiePTJQmIgh5yRSr1qixq9rTGJ8pFIkE2JhdRmOJqi01IWb vtV+Eqr53/Ldb1qCzRBlYKp8gi4mt3IpsBeyPIXb1AVp41szeuWRVbWs X-Gm-Gg: ATEYQzxQD6bmZQgh4AjOMBAA/963/naKutcWyA9ejRXPOMmPVUWXvOFxRcZzFqiRHdj Gp2wCtkqNsqJtcLU0iYpYbVUqXl0A64kOCPMOTPwcjxgKxaKdflI8q0pR5F89io70866UMRQKrU a9yY5Zf6gpoLWvcKsWZJq91LRIQw8Ni9gl5qYWZvgUvGohiiJSVn3CkdzJ4l2rnVD9yQcc1DQqY zXpuNkiTSJmMJp6zQ/WD5FzcwUDyQ1ApLoRibYVCoOMEGeLAtSyoUnebcn3NAWKHJsaAXzoZTjN 53YD0/Zem5OVz+72A+PZr0uXFmfjAUFB5NDLobrEylr/m53qEDNW2j0qA7MctYqhLLZqxQDW1JA 3fMcFEvsP0nfTIoam5z8zdpHgfUeH3HpLYXGsMEkRJZS8zWXYUOtk2dqjvbqtJ0sJX6FR03kJrs 4Okp9fGNYaQKH3so68d3CCQJOolObT1qip28UrpTrlN90INYUobNHcdP2kEzCSr5e6DyT5cKs= X-Received: by 2002:a17:90b:35d0:b0:355:35b0:8b78 with SMTP id 98e67ed59e1d1-35dc705f89bmr2619740a91.27.1775035399322; Wed, 01 Apr 2026 02:23:19 -0700 (PDT) Received: from kernel-fuzz.. ([103.172.182.26]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-35dbe959886sm4252690a91.14.2026.04.01.02.23.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Apr 2026 02:23:18 -0700 (PDT) From: ZhengYuan Huang To: mark@fasheh.com, jlbec@evilplan.org, joseph.qi@linux.alibaba.com Cc: ocfs2-devel@lists.linux.dev, linux-kernel@vger.kernel.org, baijiaju1990@gmail.com, r33s3n6@gmail.com, zzzccc427@gmail.com, ZhengYuan Huang Subject: [PATCH] ocfs2: handle invalid dinode in ocfs2_group_extend Date: Wed, 1 Apr 2026 17:23:03 +0800 Message-ID: <20260401092303.3709187-1-gality369@gmail.com> X-Mailer: git-send-email 2.43.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" [BUG] kernel BUG at fs/ocfs2/resize.c:308! Oops: invalid opcode: 0000 [#1] SMP KASAN NOPTI RIP: 0010:ocfs2_group_extend+0x10aa/0x1ae0 fs/ocfs2/resize.c:308 Code: 8b8520ff ffff83f8 860f8580 030000e8 5cc3c1fe Call Trace: ... ocfs2_ioctl+0x175/0x6e0 fs/ocfs2/ioctl.c:869 vfs_ioctl fs/ioctl.c:51 [inline] __do_sys_ioctl fs/ioctl.c:597 [inline] __se_sys_ioctl fs/ioctl.c:583 [inline] __x64_sys_ioctl+0x197/0x1e0 fs/ioctl.c:583 x64_sys_call+0x1144/0x26a0 arch/x86/include/generated/asm/syscalls_64.h:17 do_syscall_x64 arch/x86/entry/syscall_64.c:63 [inline] do_syscall_64+0x93/0xf80 arch/x86/entry/syscall_64.c:94 entry_SYSCALL_64_after_hwframe+0x76/0x7e ... [CAUSE] ocfs2_group_extend() assumes that the global bitmap inode block returned from ocfs2_inode_lock() has already been validated and BUG_ONs when the signature is not a dinode. That assumption is too strong for crafted filesystems because the JBD2-managed buffer path can bypass structural validation and return an invalid dinode to the resize ioctl. [FIX] Validate the dinode explicitly in ocfs2_group_extend(). If the global bitmap buffer does not contain a valid dinode, report filesystem corruption with ocfs2_error() and fail the resize operation instead of crashing the kernel. Fixes: 10995aa2451a ("ocfs2: Morph the haphazard OCFS2_IS_VALID_DINODE() ch= ecks.") Signed-off-by: ZhengYuan Huang Reviewed-by: Joseph Qi --- fs/ocfs2/resize.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/fs/ocfs2/resize.c b/fs/ocfs2/resize.c index b0733c08ed13..ed7ed15ad9a7 100644 --- a/fs/ocfs2/resize.c +++ b/fs/ocfs2/resize.c @@ -303,9 +303,13 @@ int ocfs2_group_extend(struct inode * inode, int new_c= lusters) =20 fe =3D (struct ocfs2_dinode *)main_bm_bh->b_data; =20 - /* main_bm_bh is validated by inode read inside ocfs2_inode_lock(), - * so any corruption is a code bug. */ - BUG_ON(!OCFS2_IS_VALID_DINODE(fe)); + /* JBD-managed buffers can bypass validation, so treat this as corruption= . */ + if (!OCFS2_IS_VALID_DINODE(fe)) { + ret =3D ocfs2_error(main_bm_inode->i_sb, + "Invalid dinode #%llu\n", + (unsigned long long)OCFS2_I(main_bm_inode)->ip_blkno); + goto out_unlock; + } =20 if (le16_to_cpu(fe->id2.i_chain.cl_cpg) !=3D ocfs2_group_bitmap_size(osb->sb, 0, --=20 2.43.0