From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=100.103.45.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1794639609; b=EJVT2d7qWvUuCI3A1yd+Q8d0XR0qsbOCk6Ai40vnq4t9EoRGYj5WbhFl8ZVDBxZudQaf 3vR21LXYeExvcG3yXFgwxQ7mMeafEOezLuEsh5kmwgR2i91c7BIacPFBvPLkDsRcNg9+E 6Kub0/0sasqvpi5Rofc/bUYgVkclxj4QkKX8c/lsJ6T7SD2uP9RMEUevXm0ibEhaMuRZP UneGakRKv8muo8FUH6Xgsvupne8uTuJAcig2oD2aZ7XENCjJXYNDK2EFR3DPruH2BKkeC ftcSpe/mU/a8KRd5ZDF2sTQ53ZkWaJc31Ywq4iUg8VZ+cDh7wKeb5vKwBLEGYWTtFMw== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1794639609; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: In-Reply-To:References:MIME-Version:Content-Transfer-Encoding; bh=c7Xdrew0JCDbeXfPaD5T7lj10ap5c6RB4I3ZvIvji8M=; b=TP0LA4OZWk5buLJslaQ6Rt+eMHT4vWDn+vxsEOI3yyBMcZRH8KwBkJqPhEuW7N7UIDY+ tQGXi7rjrh26oBlbAJp5rIQabnZ/RyGK+PuGaoELVJ7xeqhabKkeMQiweg3cLx6vXJBq8 KfHTBf3hcB4bCNUV89Pv0QQh2gaG3Io6bJEn5Actq5bUuznDBbuxbtFJmtM+CFM08ZZWg LxZzzjfCnPgvdGJxVU0XQocAhYc172bufBo+GN4n6Vt6SjdGyey4fCco4x4ke/i4KH+OP LFUzgResT3HfkapycE8qOuMK7SGL6EDpkJZkXWVUAzUtIx8+hSW8O87Fiwu+jT9aH9w== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20260515 header.b=UIxXpYbZ; arc=none smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A264C606A887 for ; Sat, 14 Nov 2026 07:00:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20260515 header.b=UIxXpYbZ Received: by smtp.kernel.org (Postfix) with ESMTPSA id 57D5B1F000C4; Sat, 14 Nov 2026 07:00:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1794639609; bh=c7Xdrew0JCDbeXfPaD5T7lj10ap5c6RB4I3ZvIvji8M=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=UIxXpYbZJ7UKccKh2OIurrSSqzysIq4/Ly52fQejboseLUO30Gyj9FXh8iq6mNLBn rtZEcpPUVCh3tU5n1cCQ0BkoycL+mXbVqKQXWMrdZwrBBffOamgwleuv9M+Fsm5SuI reyLEc/PLp8L9XAM6LFaxUTNSig8NkX6Y+CWlukNR8fgsTOsGtymgUSOYtSfcAYk8O gSd8wO2E7bcBGHA7IRvjCKpq2DqB33XC8byMUaHK2lW9/JAti85uczrYE0gDB13cqP D5tRrTgZdrQ0y54gK49zqrCTPWke/zC/whN0wz5/3leOd2uccurCilY1oUe2TwuHlo rOugjj4ZlzVLA== From: Sasha Levin To: stable@vger.kernel.org Cc: Joseph Qi , Andrew Morton , Heming Zhao , Anderson Ferneda , Mark Fasheh , Joel Becker , Sasha Levin Subject: [PATCH 5.10.y 1/2] ocfs2: use the stored hash when checking xattr bucket collision Date: Sat, 14 Nov 2026 02:00:06 -0500 Message-ID: <20261114065844.3237456-1-sashal@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20261109202706-failed-5.10-e8de099f2958@kernel.org> References: <20261109202706-failed-5.10-e8de099f2958@kernel.org> X-Mailing-List: stable@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Joseph Qi [ Upstream commit e39baff18b85cf8956aee138d7944b6581e8ba36 ] ocfs2_check_xattr_bucket_collision() decides whether splitting a full bucket can make room for the entry being set by recomputing the hash of the name: u32 name_hash = ocfs2_xattr_name_hash(inode, name, strlen(name)); if (name_hash != le32_to_cpu(xh->xh_entries[0].xe_name_hash)) return 0; For a new entry that is the hash it will be stored under, so comparing it is correct. An existing entry keeps the hash it already has: an update never rewrites xe_name_hash, since ocfs2_xa_add_entry() is the only writer of that field for a real entry and ocfs2_xa_prepare_entry() calls it only when loc->xl_entry is NULL. An entry stored by a kernel that sign-extended the name bytes when hashing can still be updated, because ocfs2_xattr_find_entry() searches a non-indexed xattr block by memcmp on the name and never looks at xe_name_hash. Growing it past the space left in the block converts the block into a tree, ocfs2_cp_xattr_block_to_bucket() fills the bucket in stored hash order, and the update runs out of room in the bucket too. The collision check then compares the unsigned hash against the legacy hashes in the bucket and reports no collision. ocfs2_xattr_set_entry_index_block() goes on to allocate a bucket that ocfs2_divide_xattr_bucket() cannot fill: a bucket whose entries all share one hash has no divide position, so all it does is append an empty bucket with a sentinel hash one above the last entry's. The re-search that follows depends on where the unsigned hash sorts. Below the legacy ones, it comes back to the full bucket and the set fails with -ENOSPC, having grown the tree for nothing. Above them, it lands on the new empty bucket, which ocfs2_xattr_bucket_find() handles explicitly and ocfs2_find_xe_in_bucket() scans zero times, so the set stores a second copy of the entry under the unsigned hash and returns success. The original stays in the full bucket, listxattr reports the name twice and getxattr returns the new copy. Pass the hash the entry is stored under instead: the stored one for an existing entry, the unsigned one for a new entry. A tree whose entries are all stored under the unsigned hash sees no change, since there the two are the same value. Link: https://lore.kernel.org/20261009083002.2621201-3-joseph.qi@linux.alibaba.com Fixes: 3bc753c06dd0 ("kbuild: treat char as always unsigned") Signed-off-by: Joseph Qi Signed-off-by: Andrew Morton Reviewed-by: Heming Zhao Cc: Anderson Ferneda Cc: Mark Fasheh Cc: Joel Becker Cc: # 6.2+ Stable-dep-of: e8de099f2958 ("ocfs2: do not read the entry array of an empty xattr bucket") Signed-off-by: Sasha Levin --- fs/ocfs2/xattr.c | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/fs/ocfs2/xattr.c b/fs/ocfs2/xattr.c index ccec77decefe2..35fab516b86ff 100644 --- a/fs/ocfs2/xattr.c +++ b/fs/ocfs2/xattr.c @@ -5603,16 +5603,14 @@ static int ocfs2_rm_xattr_cluster(struct inode *inode, /* * check whether the xattr bucket is filled up with the same hash value. - * If we want to insert the xattr with the same hash, return -ENOSPC. - * If we want to insert a xattr with different hash value, go ahead - * and ocfs2_divide_xattr_bucket will handle this. + * If the entry being set carries that same hash, return -ENOSPC, since + * ocfs2_divide_xattr_bucket() has no divide position to work with. + * Otherwise go ahead and ocfs2_divide_xattr_bucket() will handle this. */ -static int ocfs2_check_xattr_bucket_collision(struct inode *inode, - struct ocfs2_xattr_bucket *bucket, - const char *name) +static int ocfs2_check_xattr_bucket_collision(struct ocfs2_xattr_bucket *bucket, + u32 name_hash) { struct ocfs2_xattr_header *xh = bucket_xh(bucket); - u32 name_hash = ocfs2_xattr_name_hash(inode, name, strlen(name)); if (name_hash != le32_to_cpu(xh->xh_entries[0].xe_name_hash)) return 0; @@ -5709,6 +5707,7 @@ static int ocfs2_xattr_set_entry_index_block(struct inode *inode, struct ocfs2_xattr_search *xs, struct ocfs2_xattr_set_ctxt *ctxt) { + u32 name_hash; int ret; trace_ocfs2_xattr_set_entry_index_block(xi->xi_name); @@ -5728,10 +5727,18 @@ static int ocfs2_xattr_set_entry_index_block(struct inode *inode, * the maximum number of collisions we will allow for then is * one bucket's worth, so check it here whether we need to * add a new bucket for the insert. + * + * An existing entry keeps the hash it was stored under, and that is + * the hash a split has to work with. A new entry is stored under the + * unsigned one, which is what ocfs2_xa_add_entry() will write. */ - ret = ocfs2_check_xattr_bucket_collision(inode, - xs->bucket, - xi->xi_name); + if (xs->not_found) + name_hash = ocfs2_xattr_name_hash(inode, xi->xi_name, + xi->xi_name_len); + else + name_hash = le32_to_cpu(xs->here->xe_name_hash); + + ret = ocfs2_check_xattr_bucket_collision(xs->bucket, name_hash); if (ret) { mlog_errno(ret); goto out; -- 2.53.0