From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj1-f50.google.com (mail-pj1-f50.google.com [209.85.216.50]) (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 F41413AFD0A for ; Mon, 22 Jun 2026 13:03:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.50 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782133422; cv=none; b=vE+66jIKnXnDu8tyBLq9NA30dPfbW8NBwWik82DanqKE/+hIifPCsX3kCn/dk2QzPGhgMDxgw9GjMIhWrxuXtiaz4mf+uc6aAw3H9rcdSPCxxBZAaEh6PYvSRzWdeAWAa5GxpP/iWPE+6GN4P+CCBje+zPl8NNAAbN91MNLeNWA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782133422; c=relaxed/simple; bh=RfznLkS+ZpsSvId4xOD4/cnLi/Phx3olePuZ7XR8qCk=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version; b=mklf4h1KNrpqIb80iB8swt3ZfXZOiV723kvkpSVSq9t6X8Co4rHF4PuVwQxLf06+mC3OGsI5OQof8gf4aRG2sUnYvguH49QxBUkoZ/1NpAVkQ9xRHkqDJBUMuoDSYy1tfb7fwfub5JiGnJ03cFgz2eJKVuGmgrELaleSy42mrH8= 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=mfBYkWkk; arc=none smtp.client-ip=209.85.216.50 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="mfBYkWkk" Received: by mail-pj1-f50.google.com with SMTP id 98e67ed59e1d1-37c8e7c8137so2384244a91.1 for ; Mon, 22 Jun 2026 06:03:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1782133418; x=1782738218; 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=XbKFFG1L00z5MlRiOkKCPtXY87GUTjiQbqND4Ea6D2k=; b=mfBYkWkkE05kbHiA7B3JM7RM4/0opBAQXWkQrEVcpQmKgWpnPYA3XJNuppKSoeKusb USfrmbXYuQksx4quTUZcpSuO5lmccIltalEMLTkMTgLjLGfRDeT0rn3X4j+2zDFxlyPp +7W6NrWBgNxQgpoCn5u4kIpnl+Xz3KNB4okITNZJzu2G3Zpq8WvBGtHKNPMQRICQea0g GBOsCgc3rZQgIWhCuFBE6xQEsVZe+GZW/LTbiR0m9waYiWybcVDr7U8JJcRJk3QrvWUG IYcVO74DWGl2HNH6T3XzO6CfEhW/U8KOFLWl3C+USfDfAInFpGG3K7BuQ3eyUSW61c4N jNzw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782133418; x=1782738218; 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=XbKFFG1L00z5MlRiOkKCPtXY87GUTjiQbqND4Ea6D2k=; b=TLo/OPBDWyUn49/1MW5sF6ZgGJKmPPO2bWI7rrPnOilPSQaYfekkdN7pQqtiTtfapI h26LE6yZbjScuvfH9kTxHs5xmHmjas+o/6XElqBU2zpVaE/8PKki2eCgFUpled5FNOQm GT6ht6sLP/u/i1KwKzDgaoJflzHHDbzPtWrByrFjrHrCEdjqp3qD6dgtKPLWCe2oYQsr JUZdlv1rvpN/RXgCU948eSmNmMAeGxKLDg6mSGshjqYa17N2/STOoDQwVjmGTGOCbtm8 iL6QGxgNN04NG3EVw/4gGFVUC9NHGGy+YnX42Ze6k3d9XdethD6F8z/W0kAGL/+DvOSz Itmw== X-Forwarded-Encrypted: i=1; AHgh+Ro6L1jV74t6up+F9ms/vjEdI+D3G5DQnGqxpLV8R366fR+/W2HQkBgPaRNxsnAIL8MNfnDHl7lQhJYP43A=@vger.kernel.org X-Gm-Message-State: AOJu0YxxysdA/cUb3DcKgUAcqkUkC/RMhSeFprqCBnZYE9wHndbrpAll 9zcdWRF2ZPYkkt82LFI7NUJr00CTH8zncCY8uLkewgGMlYr1N9qu9Zae X-Gm-Gg: AfdE7clWor7LZw36HC99ZG37dOk536ihVnK1z0bj21raFQwpG+0s6UW4JSU/bs6Rfg8 sXQTV5FyVtuengBzT37MT+2wCmIntf+tXJlNyBRXquOOxBgXn9COWO986CCInEcfr/GgBLAOTb4 WIy71lzo8VI75qTiRfUWbKieMTlO8svD0kRbNOvkgBD9MtYuDn+fyCCBAmvrFl2i64DFW/dCsQa uFNlXWfcKntnxP3fAibGsOA29Lly+CdCgA97AQSjKjh32Bsif8TIzI4v/BZt37HzCa6W0p84F54 +ngwihfPkeTLcK9jRaXLsSp+G6TWMnJOIYGQYhfeHuC5rMBCH90Q2GMZuG2GcVDLesGrT06D6PZ E+aw2aPkEU4beaHUfFfGgWSqFbprYedCiMJVg3EBzwn9v/urFlElarpB1SS86xSaid5PXQVE9ct NKhib56XyZYUeE0hzaQA== X-Received: by 2002:a17:903:390d:b0:2c6:b38b:e75d with SMTP id d9443c01a7336-2c725d38359mr158556635ad.20.1782133418077; Mon, 22 Jun 2026 06:03:38 -0700 (PDT) Received: from localhost ([111.228.63.84]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2c743fd6420sm78895885ad.70.2026.06.22.06.03.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 Jun 2026 06:03:37 -0700 (PDT) From: Cen Zhang To: Joseph Qi , Mark Fasheh , Joel Becker Cc: ocfs2-devel@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH v4 0/2] ocfs2: validate xattr metadata bounds Date: Mon, 22 Jun 2026 21:03:30 +0800 Message-Id: <20260622130332.2094018-1-zzzccc427@gmail.com> X-Mailer: git-send-email 2.34.1 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Hi, This v4 rebases the series on current torvalds/master and reworks the inline xattr part on top of the newly merged ocfs2_xattr_ibody_lookup_header() helper. Patch 1 extends the shared ibody helper with xattr entry name/value bounds checks and calls it from ocfs2_validate_inode_block(). Patch 2 validates non-indexed external xattr blocks from ocfs2_validate_xattr_block(). Indexed xattr buckets do not pass through that validator, so their header and per-entry bounds are checked after bucket ECC verification in ocfs2_read_xattr_bucket(). Both issues were reproduced with crafted OCFS2 images under KASAN. Changes since v3: - Rebase on current torvalds/master. - Build on the newly merged ocfs2_xattr_ibody_lookup_header() helper instead of adding a duplicate inline-header helper. - Keep indexed bucket xh_entries[] bounded by the first bucket block, while checking name/value offsets against the addressed bucket block. Cen Zhang (2): ocfs2: validate inline xattrs during inode block validation ocfs2: validate external xattr entries when reading metadata fs/ocfs2/inode.c | 4 + fs/ocfs2/xattr.c | 192 +++++++++++++++++++++++++++++++++++++++++------ fs/ocfs2/xattr.h | 2 + 3 files changed, 177 insertions(+), 21 deletions(-) -- 2.43.0