From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 07ACE40E946; Sat, 28 Feb 2026 17:44:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772300684; cv=none; b=IhYkjcbylD5L9uZRCDB0gj1Jl57FE4byspENAtr/ZTuraqeZZzw82dKaJwtT+TUlhNcCOsvCwR91YM2ermj3IADsR2NZYZaze91cxa5gaXchBNRHFpm5yDvHEk4O3EbiHWWLrJPqygTFfY1Pwtu25QdBkc2rT00Q9ILg2tfSGiQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772300684; c=relaxed/simple; bh=829/Owi9SM/5ByjQlN4zVXMTkXwocNKaHkz6VOhfvpc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=EH8ynnL7HtHb/3ynH0jk8dFuIqpQBCuKG9P59fSwS2sTAJLp1HZU04iYET9jKL8xstF2C8BRwLH0J09Rfd3ad7wKYnbxuXwM0XhKQjgX10WgvIe4qrtpYj1u+cygihqJgAShghNRLWE8TIRoC8mj7+VK+xvCmqVdFdfTrMCIsDA= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=FXG2digM; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="FXG2digM" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8A5ADC19423; Sat, 28 Feb 2026 17:44:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1772300683; bh=829/Owi9SM/5ByjQlN4zVXMTkXwocNKaHkz6VOhfvpc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=FXG2digM8/+R178tdEn9L8/cxk932JfsZ92Du83znOahYHBrr3bhSksOHmtf1cl7X UhabIOlvyAYNsEVjIVH2xITlhKOTVyUfXlLuckvrEZIQLduBXg6tfy9xxIRo3A+pJr YblctWQPb0Kgsa4kn5pjz0yR/dqNzmO0Vl/c3dD2noAGYx6snFdx6s7Umtwz5mFM4h /i6Qu2v1O0siETOUwkD5QKM7yBK2WiELv3F1zg5YtEWNM9VKEj+hTXfdqw+HYLf3QU U1ygOO+03Z16/TQ7OWMR/VzJxARhVfyrkQSNPv/2IZXmK1OGx9vk2vMKcc9pxftRne 2tvq8Qpqzfp2A== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Heming Zhao , Mark Fasheh , Joel Becker , Junxiao Bi , Joseph Qi , Changwei Ge , Jun Piao , Andrew Morton , Sasha Levin Subject: [PATCH 6.19 720/844] ocfs2: fix reflink preserve cleanup issue Date: Sat, 28 Feb 2026 12:30:33 -0500 Message-ID: <20260228173244.1509663-721-sashal@kernel.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20260228173244.1509663-1-sashal@kernel.org> References: <20260228173244.1509663-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit From: Heming Zhao [ Upstream commit 5138c936c2c82c9be8883921854bc6f7e1177d8c ] commit c06c303832ec ("ocfs2: fix xattr array entry __counted_by error") doesn't handle all cases and the cleanup job for preserved xattr entries still has bug: - the 'last' pointer should be shifted by one unit after cleanup an array entry. - current code logic doesn't cleanup the first entry when xh_count is 1. Note, commit c06c303832ec is also a bug fix for 0fe9b66c65f3. Link: https://lkml.kernel.org/r/20251210015725.8409-2-heming.zhao@suse.com Fixes: 0fe9b66c65f3 ("ocfs2: Add preserve to reflink.") Signed-off-by: Heming Zhao Cc: Mark Fasheh Cc: Joel Becker Cc: Junxiao Bi Cc: Joseph Qi Cc: Changwei Ge Cc: Jun Piao Cc: Signed-off-by: Andrew Morton Signed-off-by: Sasha Levin --- fs/ocfs2/xattr.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/fs/ocfs2/xattr.c b/fs/ocfs2/xattr.c index 1b21fbc16d73a..1bff4f2d1345e 100644 --- a/fs/ocfs2/xattr.c +++ b/fs/ocfs2/xattr.c @@ -6394,6 +6394,10 @@ static int ocfs2_reflink_xattr_header(handle_t *handle, (void *)last - (void *)xe); memset(last, 0, sizeof(struct ocfs2_xattr_entry)); + last = &new_xh->xh_entries[le16_to_cpu(new_xh->xh_count)] - 1; + } else { + memset(xe, 0, sizeof(struct ocfs2_xattr_entry)); + last = NULL; } /* -- 2.51.0