From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pf1-f182.google.com (mail-pf1-f182.google.com [209.85.210.182]) (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 44EE53264E5 for ; Fri, 3 Apr 2026 06:30:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.182 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775197834; cv=none; b=e9KF/FPGEmIelYRenllb0ybLqDLhYLddRWnv6XcBgmGKpr0PYYij+CIE/2JgmFYCj04kmICmZeNeIwR8qHt1J/UhnMLFyDhRg4IBVHTEPRdHiIUp6PI4EEGCiBHJwvwGIQ7AtixJTYfkosy5bP/GQbEV4svfKAjdmaeENpzNCMs= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775197834; c=relaxed/simple; bh=wflK+Q0rdwZILUEehzxtt+ZmI9qWCqp2RSyvZDs2OvA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=sB8xXiG+tn/Kld9zjBLKUZHzF09Bx+mpQ0DD6B2/zDcS51hQhZdF8vKW/+Tkx6EjyFKMR/bhN8Eg+w/Rd81ykzIY9/xrZyI+q+IcVyVbrpFy+03STr3dqBDKWU+/F6NcffuufUkX/P93vU6LVdZvFOv/JxA/sZ4ZiEj4M2mBq5Y= 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=iS4HJ7NH; arc=none smtp.client-ip=209.85.210.182 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="iS4HJ7NH" Received: by mail-pf1-f182.google.com with SMTP id d2e1a72fcca58-827270d50d4so1457657b3a.3 for ; Thu, 02 Apr 2026 23:30:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1775197831; x=1775802631; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=zNcCckldB93xLM/JDGzLlnsXuLvNw7uNddJEgP2ONrY=; b=iS4HJ7NHX4QBXBd6miamtW8GyKWfa07rvuOtDH4OgJK71Vv+7e/Q/1In4pbTz50Fu+ 2u68zYDQ1erGrWH3nRa9PtMYFb0a6JjKsr1hv0j6cbk3eCMdmCjXG/lncVj3xsS5feZ+ laAIOI2ru85UIr5Y6WywTWtH9Kwx9+IpsHneaHOWqdZPmMubrreDukUyPO9fosvzsweb xBP7hDy/AbGNwl9Df6C6r4umKhMxIzCzx7ruLW/WuZxV72MjElSM1eT0wrg7Jr/VWkX4 dF518t0DiN5zMSExdXcBD98n9q3WTZuN8RfbOYx9W/A/cji9nXk2j+6UJ2Dztd/bSKnw ZPkw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775197831; x=1775802631; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=zNcCckldB93xLM/JDGzLlnsXuLvNw7uNddJEgP2ONrY=; b=kKSdkOWRe2OnBR8JozZVrs/jyNe8UiNUpr1P+/nPBiAMeWGVdibiXimDo51eXaEvSE wcv3QqQDgtiTzX82t4oHNZW0NimfMDYd8KtB/dbmNtDZABzXhcfSifPdZTU8UFUbZwcG fnKLBvJgXJyT8OoAnZDKRkubmE8uCBWvqyUhykaMyJRvTorw8vqMnWxdMTT7cKoNfSCk PLETMY9lK9zpOhuPF0vRI2q0I7dTuHJeut6UjVpBEnTQCKm2yciOQIIdrzzPSpWi96c6 T6aePrpHG9Z3Ds4tn6UTikaNNT+QS5EikzXAI2upvsdFoU/8h+M6Qd9QY2OMM5eSnwVt I3kQ== X-Forwarded-Encrypted: i=1; AJvYcCXRk76Ilv7IuL7a7uhz+sOdW1+wJ5htPEQyf9vQkIrP7a81qVw7DUrjPUkzr4DlCcEjtUA3S2MTxldKHPk=@vger.kernel.org X-Gm-Message-State: AOJu0Yz5tq+j268jHgwLsensky/GEiypxHecbelUvvxSwvDQ7wR0vAHO yO1/pTlw62IQ72ewWamna9Tm0x8aVF2rPXStRXN3heahjBT+KjTWGgxb X-Gm-Gg: AeBDievtLKqM4Is2xEXvWdz4YCkfxKQXPsrF40tWyEACJgbJ0u9kf8L9xF7nlRPPUWF dmay2U2igrsZXQNTHXD2ICPAl98IUKxCJyWDVnUfy6KEGqtn+WzU/V3c85MPeVphtWgpOt1QBD/ nyzS2IpyZbn8x2yI/B79NrYnYZ+JMZ5HV6RNo/GRK/kN1BSSazAdHA5nW2IalJZPK/ARVwOESsb XD3yz+K4EYQc//No4nSJ/6HBK8pMG9LpDLaRqegySSdg+ehiey/S7o2ud+Qo5rNM1H3oIu0V7lr AMKkgcKRLdi9ltmzqXKcb1/TJl2XUckrTihIhT4JNiWF5atLIRkIvchAHM0IUkuQ4w7l8wL3x/P c/4uyEgm0mQXWly74GO63oe5Uu/n8v91XynmHQtXjMCTeBmgvVIO7wp0v99XC0q9foJpM++9mvA lRj0MwViL70OpHPQ7r38P6/Dyo7m1i5n3f9ildnX2vhNFgnuA5+JhlMkFQCRSErCIi/L5Aw2I= X-Received: by 2002:a05:6a00:909a:b0:82c:77cd:50e8 with SMTP id d2e1a72fcca58-82d0db7e890mr2033087b3a.27.1775197831231; Thu, 02 Apr 2026 23:30:31 -0700 (PDT) Received: from kernel-fuzz.. ([103.172.182.26]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-82cf9c41b8dsm4572258b3a.34.2026.04.02.23.30.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Apr 2026 23:30:30 -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 1/3] ocfs2: handle invalid dinode in reserve_suballoc_bits Date: Fri, 3 Apr 2026 14:30:14 +0800 Message-ID: <20260403063016.438287-2-gality369@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260403063016.438287-1-gality369@gmail.com> References: <20260403063016.438287-1-gality369@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit [BUG] A crafted filesystem can feed an invalid dinode into ocfs2_reserve_suballoc_bits() and trip: kernel BUG at fs/ocfs2/suballoc.c:806! Oops: invalid opcode: 0000 [#1] SMP KASAN NOPTI RIP: 0010:ocfs2_reserve_suballoc_bits+0xccd/0x3e00 fs/ocfs2/suballoc.c:806 Code: c0fe488b 9d58ffff ff4885db 740de8fa Call Trace: ocfs2_reserve_cluster_bitmap_bits+0xe5/0x1c0 fs/ocfs2/suballoc.c:1134 ocfs2_local_alloc_reserve_for_window fs/ocfs2/localalloc.c:1108 [inline] ocfs2_local_alloc_slide_window+0x2cb/0x1570 fs/ocfs2/localalloc.c:1244 ocfs2_reserve_local_alloc_bits+0x654/0xa10 fs/ocfs2/localalloc.c:669 ocfs2_reserve_clusters_with_limit+0x785/0xe40 fs/ocfs2/suballoc.c:1168 ocfs2_reserve_clusters fs/ocfs2/suballoc.c:1229 [inline] ocfs2_lock_allocators+0x319/0x520 fs/ocfs2/suballoc.c:2772 ocfs2_write_begin_nolock+0x256a/0x5f30 fs/ocfs2/aops.c:1719 ocfs2_write_begin+0x1b6/0x2e0 fs/ocfs2/aops.c:1884 generic_perform_write+0x409/0x8c0 mm/filemap.c:4255 __generic_file_write_iter+0x1bb/0x200 mm/filemap.c:4372 ocfs2_file_write_iter+0xa87/0x1e10 fs/ocfs2/file.c:2469 do_iter_readv_writev+0x61d/0x850 fs/read_write.c:827 vfs_writev+0x323/0xca0 fs/read_write.c:1057 do_pwritev+0x193/0x250 fs/read_write.c:1153 __do_sys_pwritev2 fs/read_write.c:1211 [inline] __se_sys_pwritev2 fs/read_write.c:1202 [inline] __x64_sys_pwritev2+0xe8/0x160 fs/read_write.c:1202 ... [CAUSE] ocfs2_reserve_suballoc_bits() assumes ocfs2_inode_lock() always returns an already validated dinode buffer. commit 10995aa2451a ("ocfs2: Morph the haphazard OCFS2_IS_VALID_DINODE() checks.") replaced the old corruption handling with BUG_ON() under that assumption. However, JBD-managed buffers can still bypass inode validation in the read path, so corrupted dinode data can reach this function. [FIX] Treat an invalid dinode as filesystem corruption and return through the existing bail-out path instead of BUG()ing. This matches the nearby OCFS2_CHAIN_FL handling and keeps allocator cleanup unchanged. Fixes: 10995aa2451a ("ocfs2: Morph the haphazard OCFS2_IS_VALID_DINODE() checks.") Signed-off-by: ZhengYuan Huang fs/ocfs2/suballoc.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/fs/ocfs2/suballoc.c b/fs/ocfs2/suballoc.c index 6ac4dcd54588..12ac2bb3f10b 100644 --- a/fs/ocfs2/suballoc.c +++ b/fs/ocfs2/suballoc.c @@ -801,9 +801,13 @@ static int ocfs2_reserve_suballoc_bits(struct ocfs2_super *osb, fe = (struct ocfs2_dinode *) bh->b_data; - /* The bh was validated by the inode read inside - * ocfs2_inode_lock(). Any corruption is a code bug. */ - BUG_ON(!OCFS2_IS_VALID_DINODE(fe)); + /* JBD-managed buffers can bypass inode validation. */ + if (!OCFS2_IS_VALID_DINODE(fe)) { + status = ocfs2_error(alloc_inode->i_sb, + "Invalid dinode #%llu\n", + (unsigned long long)OCFS2_I(alloc_inode)->ip_blkno); + goto bail; + } if (!(fe->i_flags & cpu_to_le32(OCFS2_CHAIN_FL))) { status = ocfs2_error(alloc_inode->i_sb, -- 2.43.0