From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pg1-f176.google.com (mail-pg1-f176.google.com [209.85.215.176]) (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 825922F8EAF for ; Thu, 25 Jun 2026 09:13:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.176 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782378796; cv=none; b=DW1nOgytgHyDQUIU0r/eYXI3LQx31JHtZIt4jkSlKvmBPlNCS3NrEnxh9cvZNrstPvL4eNBWVSgATGrDCXb7xnPTCtfwD0yxvZY9Xe5IU9JOVktZaH8A+3/osnhrLWdLUKKx7C/JNzXo/pxYC/mc4VwrOGtB0B/zeSRSlLtW8Pc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782378796; c=relaxed/simple; bh=9910rDOdgntu/IdL/bzHysNcQGCMg3BxBboAi+zYMeo=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=c8n3yvf78hkH/Iqgy0GC1nC8OCHthUUOSlUUN6NUKHtWUZUr2EUUO2V9bdT3oFPEEUqGCWVUwFi90X5RfmksegDy7hj05XkG9YAT0a5jaHrTzvsVH0BtQWmAb7uhfL0pf0rrQ4ESycrG/ezeNVaiiO4H8X8KiiZeIK+N0b9wvNM= 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=g0lPWycr; arc=none smtp.client-ip=209.85.215.176 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="g0lPWycr" Received: by mail-pg1-f176.google.com with SMTP id 41be03b00d2f7-c88d1d4543fso317740a12.0 for ; Thu, 25 Jun 2026 02:13:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1782378795; x=1782983595; 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=NqPfV+tCqNEZnFIAUu2y2M5HYLqzWY3lJT6vyiF2WMo=; b=g0lPWycrySopL/JEPAeeTleh329A8YQxkFYxduzcaT7XBDM+CUqi/7Yg4WBlFNY5/h R7UyYkN079gg/aD6vMta5+f3WqCXYHbI8iEqX2BMWBcTNAvp+ulgPPExsHv0zktxoU/Y c7T2GNY27O2OGGJ5FT67fxwEuD2Bb8a3NuSXuGp1oWjAetRg++9HWyNolCDS2ulp9s/6 oYBMfZdwVUzrquc9/x7XuYC9Gji+ainN8IkvnIgMhaJgKHIsIPo994rmf0ol85FZ4Re4 7ImH/CtZUJYj0LBS2JZZ1CqYThhjvzEH47Ywe0A9R+p/oE7jNtkoQv9BfKnvhJ1Yo1vE hByQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782378795; x=1782983595; 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=NqPfV+tCqNEZnFIAUu2y2M5HYLqzWY3lJT6vyiF2WMo=; b=kKQvS374VdZv0XuzSXLCJ7fBkYTUDWNp652n2edNyNpTurYMgSJI7HptkAqCZ4j6dH b6lrqJT+FeEoKH9HyY9Mo7SnrkroBgg59BCxkrpV/xQVlJHc/PC0DY0UETZVbJlob5OA q1TSDt4LcSlS25DW+bvON5CkH2boiVho/twrr4lHZpwaWupqeRpU8BEbSG4ITgFeQ9R7 aC03CRSeD1HUelhfuNPuhlOShzwgfSurf5qePoqADP8OJoWpHDSQPfltMdp4DnqD8I/m E2E/pVcuKE/WAfHzuvbsqaMZ228OINggrGx4SCssaCa4wu0g9rVI2umhMV35kGOKwZB6 BMHw== X-Forwarded-Encrypted: i=1; AHgh+RpZbfxNJFpezCxILhHsGBQP5NFjpSLa+inRKUaXAxyzdOZjtWEPH0yOTWCu3pXnVr8EfwXVwke/oEpdKD0=@vger.kernel.org X-Gm-Message-State: AOJu0YyIZY8zI1DiQyWdkx0lmyFmy4ymsT0Af5TvxMcsXxf/a79GaZll MaPgDKhokvCGSLAdzXVbPeeHlrQVjCvgrLyOT3jkEz7ju43rbK3pqZO4 X-Gm-Gg: AfdE7cnh2nCurjUcqTyyOJmyuYX9kA1ZviDj9dnEMXeUXpjQdk0nw6E9Nfsn9QRqr1K T9dmxo8AESvwKRnU7/mSNN2UcXjz1mZP3YELkQcRfrvjR5i/zHVGrBk1Mf8om432DhWg/aRvgWy eaXBuczQDsNMlsLVk97RV1/xppz2scmBf0HRXrKPQnDcuwx7CLGjsZVtBpmAJEaaonWM0XC9tEe XLartXoBMvPyEH4IvjwXH6rPlqCIK6YfMpT02pA5RNez18Cp90fd1EqtDTYgl2iJthTVCmM+LOv 7CM0iFoJ0OOEkQt6Me7qVEGvdNwJSFeYCce6CLsyv7nfG1fNmqU9Zotr2g9mLNmb9vKVueJXNLp wZOiepHoysDydz6ytI+y1kxXCTqPD7kZ0BkNlKkCMZOzybzLUINboKNgbmr8YWnIZPTmTf41PkG KEy0PcGUU= X-Received: by 2002:a17:902:e78d:b0:2bf:13af:b077 with SMTP id d9443c01a7336-2c7fcf9ee27mr14520995ad.14.1782378794595; Thu, 25 Jun 2026 02:13:14 -0700 (PDT) Received: from localhost ([111.228.63.84]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2c7f5ac899esm16205485ad.7.2026.06.25.02.13.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Jun 2026 02:13:14 -0700 (PDT) From: Cen Zhang To: Joseph Qi , Mark Fasheh , Joel Becker Cc: ocfs2-devel@lists.linux.dev, linux-kernel@vger.kernel.org, zzzccc427@gmail.com Subject: [PATCH v6 2/2] ocfs2: validate external xattr entries when reading metadata Date: Thu, 25 Jun 2026 17:13:03 +0800 Message-Id: <20260625091303.234624-3-zzzccc427@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260625091303.234624-1-zzzccc427@gmail.com> References: <20260625091303.234624-1-zzzccc427@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 ocfs2_validate_xattr_block() checks the xattr block header before the block reaches higher-level xattr users, but it does not verify that a non-indexed block's xh_count and entry offsets fit inside the block. Indexed buckets likewise reach list/get consumers after ECC without an entry-bounds check. Reuse the xattr entry validator for non-indexed external xattr blocks and indexed buckets at metadata read time. The enum entry type selects the storage geometry: non-indexed blocks use the xattr block payload, while buckets keep the entry table bounded by the first bucket block and check name/value offsets against the bucket block they target. Reject corrupted external xattr metadata before listxattr() or getxattr() can walk out-of-range entry arrays or name/value offsets. Validation reproduced this kernel report: BUG: KASAN: use-after-free in ocfs2_xattr_list_entries+0xd7/0x190 Read of size 1 at addr ffff88810a654007 by task ocfs2_xattr_lis/630 Call Trace: dump_stack_lvl+0x66/0xa0 print_report+0xce/0x630 kasan_report+0xe0/0x110 ocfs2_xattr_list_entries+0xd7/0x190 ocfs2_listxattr+0x3f6/0x610 listxattr+0x90/0xe0 path_listxattrat+0xed/0x220 do_syscall_64+0x115/0x6a0 entry_SYSCALL_64_after_hwframe+0x77/0x7f Fixes: cf1d6c763fbc ("ocfs2: Add extended attribute support") Fixes: 0c044f0b24b9 ("ocfs2: Add xattr bucket iteration for large numbers of EAs") Assisted-by: Codex:gpt-5.5 Signed-off-by: Cen Zhang --- fs/ocfs2/xattr.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/fs/ocfs2/xattr.c b/fs/ocfs2/xattr.c index b6f00926849d..cb0775d526b8 100644 --- a/fs/ocfs2/xattr.c +++ b/fs/ocfs2/xattr.c @@ -396,6 +396,13 @@ static int ocfs2_init_xattr_bucket(struct ocfs2_xattr_bucket *bucket, return rc; } +static int ocfs2_validate_xattr_entries(struct super_block *sb, u64 blkno, + struct ocfs2_xattr_header *xh, + enum ocfs2_xattr_entry_type type, + size_t storage_size); +static int ocfs2_validate_xattr_bucket(struct ocfs2_xattr_bucket *bucket, + u64 blkno); + /* Read the xattr bucket at xb_blkno */ static int ocfs2_read_xattr_bucket(struct ocfs2_xattr_bucket *bucket, u64 xb_blkno) @@ -414,6 +421,8 @@ static int ocfs2_read_xattr_bucket(struct ocfs2_xattr_bucket *bucket, spin_unlock(&OCFS2_SB(bucket->bu_inode->i_sb)->osb_xattr_lock); if (rc) mlog_errno(rc); + else + rc = ocfs2_validate_xattr_bucket(bucket, xb_blkno); } if (rc) @@ -515,6 +524,11 @@ static int ocfs2_validate_xattr_block(struct super_block *sb, le32_to_cpu(xb->xb_fs_generation)); } + if (!(le16_to_cpu(xb->xb_flags) & OCFS2_XATTR_INDEXED)) + return ocfs2_validate_xattr_entries(sb, bh->b_blocknr, + &xb->xb_attrs.xb_header, + OCFS2_XATTR_BLOCK, 0); + return 0; } @@ -1119,6 +1133,17 @@ int ocfs2_validate_inode_xattr(struct super_block *sb, u64 blkno, inline_size); } +static int ocfs2_validate_xattr_bucket(struct ocfs2_xattr_bucket *bucket, + u64 blkno) +{ + struct super_block *sb = bucket->bu_inode->i_sb; + + return ocfs2_validate_xattr_entries(sb, blkno, bucket_xh(bucket), + OCFS2_XATTR_BUCKET, + sb->s_blocksize * + bucket->bu_blocks); +} + static int ocfs2_xattr_ibody_lookup_header(struct inode *inode, struct ocfs2_dinode *di, struct ocfs2_xattr_header **header) -- 2.43.0