From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f182.google.com (mail-pl1-f182.google.com [209.85.214.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 41E7D37F75E for ; Fri, 8 May 2026 09:00:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.182 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778230805; cv=none; b=IqvJkyFBePh7FZ16AOfTue9GepBOsSPu2OJYjd73b8XO0j4p0l/TCWFiO1ICEkdylgrrngvgWVzjegJgxtI/7iXk1llaABnbU8ILddoUPboZczORZrXFZ6nEd9RAkKlD3wbY9Q49vbu3WhQMECy9HC4fxOgQ4R+N9Focp9oatpk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778230805; c=relaxed/simple; bh=oQ8dke2rWFaSskvr2FsQetdBTXzOiYOJMNp/wJLjeTs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=H4Rn6MfazmyOkbL9Z2wUvWKgWbKTRCkjHV89wkeVjJWsJJHtDChFdY/DhxNqk3sItCALiO08WjPMsJLVjurA84lqdHg9r68kACn40oX6wn6CFA+eMz0fuGNjuIT+5fW+8Rx8ri/AQ2EcByJMV5S99xLsPHY/OZJzTnWrRvcz9Dc= 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=kKI1fVSr; arc=none smtp.client-ip=209.85.214.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="kKI1fVSr" Received: by mail-pl1-f182.google.com with SMTP id d9443c01a7336-2ab077e3f32so8557265ad.3 for ; Fri, 08 May 2026 02:00:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1778230804; x=1778835604; 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=93r39cWo69bIErRsaiSDOdIu+drnExlfendQTTfQlzc=; b=kKI1fVSrVEZUOSxjCkWytEF3exAlZwCkG/1pj7AQnc9CbOjY9CzfXGK14UwXVkge9W oOWTXLOb7Wni0RS9c44LOuJ5AFuesHofR/ZJATHhljCvIzUYeusbp/XfBMPlBo0XYNH9 uHReAidbmYrOmsAxu/wQaGoWntJM9ruCvSzbtKsZVQIzKP4+hVkMewNkdwnVyDnVM9nn 7jdgOK4OrLYi9Fs53oFEcpJ0EjWJzrnL9iDZyHuNu1zAAp56pCwTvYjEPn3jm4VgijSL 38hT/PGdKQfeNqltueFvaFwtUEYXu2oZrHUB7+KGUpZd5qm/n+ru3OnOTRTVT7q0MNFp IrZg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778230804; x=1778835604; 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=93r39cWo69bIErRsaiSDOdIu+drnExlfendQTTfQlzc=; b=mqZlpheFM5a/Yp4x4i6JEo05C42oVyEpIisdEvv9Cr0ZhVdxwLQZPieYbkzNISh9lz HPo4TwHLiEERwZ4u++GwfxhjrOhDF8EEXN7VXWmnMK7JcZIfWWVwrR3UwS55TH3vJ7uJ umnxoA2aY5V1vj+aZ79eobE5P3KqHi90FSWG4s2/DW70PP5YBL/ZT/rpUTPGcYm31zWg k0pQwWujqeAwnIiq9U0ncLLjZPe9Lp8LPPukiiPVgQQbFrfrzgWR6NpNruwfE3e6ZOo/ Q1C3Hjp82UwZrxUtYx5Y0ayj7/3U8ZzJzYwu75oZJwhn6n9MAEkFw8s8PXBZ06Lwg7X+ 42cw== X-Forwarded-Encrypted: i=1; AFNElJ/mkT0bHzHG7SOI/h37jvs2XEIpaMU3vch7wYPL7R3vmg9W7NsM+NJxvc2SoRchpxV4gXZ6cZNGZk22qvo=@vger.kernel.org X-Gm-Message-State: AOJu0YwE5pchZQ8zLmWBkwP/0i23qFlNKboVkxxW5TqF8XxFfyP6VP88 ORTmBd7X0vma9tmHQXMsMy+dFGJc3Xak+UiaahEmKNUTeE3p0tOD18U/ X-Gm-Gg: Acq92OHc1+I3hf4ugFC575IjIp5OhAE5llfW4X4/jI+mBR0kTWEdo8dISzFHPkpoyqZ kiBJLfR7R+LdAjhPi2b/5oLjx6qjriJqqvtPVAzcyw73TXxzH8yzcikR9lNF3mL/d/7EHkpHa1Y w4QHr/xJ03q1aLR12Ht8F13Pgc48lZPYkgqsQxJyghPmPHJEPX8pwFFzvN7I7kjOfp3KQ53QF/n L19PHza73/Lq91jiz8+Fgtq374ioEIo4uC2EBq92rPrSJsxmznlalkpzXk/POqtC1uG3p6SsvxB Wt/zuyLhEKOB3w9rBogj5fQQ57gigQg+8+GC5MlFJRC+srhTIjb9f5Jy74HLS7yB10UjFxCZcpi zL3vH5Z3USBKL/5967itzem0B+VBSbEH3mzSlL3kkJPr0v4GyVU7j29jq4CFwj2nltu5tu+9sOC ECd/JPDxwTOfgHmJeEi3QlpmOdnYp76QtBsmnXXYzbAgnxOch+dKvxamPsarDKKOQ9n4PHxAkQn 39RRFGU20KW0wbb4YurLuBdZg== X-Received: by 2002:a17:903:228c:b0:2b2:4194:9521 with SMTP id d9443c01a7336-2ba79287606mr123764565ad.25.1778230803336; Fri, 08 May 2026 02:00:03 -0700 (PDT) Received: from localhost.localdomain ([111.202.175.43]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2baf1d2709bsm15526795ad.5.2026.05.08.01.59.56 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 08 May 2026 02:00:02 -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 4/5] ocfs2: validate inline xattr header before inline refcount attach Date: Fri, 8 May 2026 16:59:13 +0800 Message-ID: <20260508085914.61647-5-gality369@gmail.com> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20260508085914.61647-1-gality369@gmail.com> References: <20260508085914.61647-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 corrupt inline xattr header can make ocfs2_xattr_inline_attach_refcount() feed an unchecked header into the refcount-attachment walk for inline xattr values. [CAUSE] The inline refcount-attach path still derived the header directly from di->i_xattr_inline_size and then passed it to code that iterates xh_count and xattr entries. [FIX] Use the shared ibody header helper before attaching refcounts to inline xattr values so corrupt header geometry is rejected with -EFSCORRUPTED instead of being traversed. Signed-off-by: ZhengYuan Huang --- fs/ocfs2/xattr.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/fs/ocfs2/xattr.c b/fs/ocfs2/xattr.c index bbb25a01b097..4877406a83ce 100644 --- a/fs/ocfs2/xattr.c +++ b/fs/ocfs2/xattr.c @@ -6016,14 +6016,17 @@ static int ocfs2_xattr_inline_attach_refcount(struct inode *inode, struct ocfs2_cached_dealloc_ctxt *dealloc) { struct ocfs2_dinode *di = (struct ocfs2_dinode *)fe_bh->b_data; - struct ocfs2_xattr_header *header = (struct ocfs2_xattr_header *) - (fe_bh->b_data + inode->i_sb->s_blocksize - - le16_to_cpu(di->i_xattr_inline_size)); + struct ocfs2_xattr_header *header; + int ret; struct ocfs2_xattr_value_buf vb = { .vb_bh = fe_bh, .vb_access = ocfs2_journal_access_di, }; + ret = ocfs2_xattr_ibody_lookup_header(inode, di, &header); + if (ret) + return ret; + return ocfs2_xattr_attach_refcount_normal(inode, &vb, header, ref_ci, ref_root_bh, dealloc); } -- 2.43.0