From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (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 82E1C471401; Tue, 21 Jul 2026 17:51:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784656308; cv=none; b=D3Wj/Uc+85SeC7iist9AFzy33wKhi5Ts9rYGjB8qN4FnmublVA6cLBtSFAD5/O2LZ8bswA4GNZo6XgS03aLa6Wuzjqsmjl5DsI09nkGPS5N/GvHsD6hHM32SZVE6qlj7A6Sdl9jZuNljKzFHHz+AFsjeAHsWN39F4iqd4GPwDnY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784656308; c=relaxed/simple; bh=9s1I+UuNcu8NRyUsaGYsXjvdM96F11FwB77txdu8jTk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=eiHcL1Nkm6s7K3l77cHp80j2RQGByk0eTSSKub5WsngZpLxN6YiybhChBiZP+zDV+ML4Wno7bwanaIRp4C1JwN73Q4ySKJvnE12RqGGM1m6MTCoVxMx+g0OIJVOJZWSp9067dmEcuU37UbawF5kDkuoN2+g7n6htFUwhrA7SkBk= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=iUg7o2Gn; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="iUg7o2Gn" Received: by smtp.kernel.org (Postfix) with ESMTPSA id B03531F000E9; Tue, 21 Jul 2026 17:51:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1784656307; bh=4mznT0CS/1qEdGN+5ujeyEbh2hCCEB0LTss+UdSSHFo=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=iUg7o2Gnef+1apmOUxp5ApWVh7f9UPSUFu+3hLhA67q7CsConzIW81G0/Oa+y6izo +vARxn1GHosQqDqrxEvFyEYuBlIQqPDT9M98nO+1+bGcJPML9EBDvqzBhZguM/CPoX zrDrG2igpqDmND2xbk/8VVUL0v6JVLk8AGRVgtDQ= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Joseph Qi , Ginger , Mark Fasheh , Joel Becker , Junxiao Bi , Changwei Ge , Jun Piao , Heming Zhao , Andrew Morton , Sasha Levin Subject: [PATCH 6.18 0339/1611] ocfs2: fix race between ocfs2_control_install_private() and ocfs2_control_release() Date: Tue, 21 Jul 2026 17:07:35 +0200 Message-ID: <20260721152522.736424306@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260721152514.750365251@linuxfoundation.org> References: <20260721152514.750365251@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Joseph Qi [ Upstream commit 57dcfd9049d497c31151787a0696d59f0a98f8e6 ] Move atomic_inc(&ocfs2_control_opened) and the handshake state update inside ocfs2_control_lock to close a race window where ocfs2_control_release() can observe ocfs2_control_opened dropping to zero (resetting ocfs2_control_this_node and running_proto) while ocfs2_control_install_private() is about to bump the counter and mark the connection valid. Link: https://lore.kernel.org/20260601121618.1263346-1-joseph.qi@linux.alibaba.com Fixes: 3cfd4ab6b6b4 ("ocfs2: Add the local node id to the handshake.") Signed-off-by: Joseph Qi Reported-by: Ginger Cc: Mark Fasheh Cc: Joel Becker Cc: Junxiao Bi Cc: Changwei Ge Cc: Jun Piao Cc: Heming Zhao Signed-off-by: Andrew Morton Signed-off-by: Sasha Levin --- fs/ocfs2/stack_user.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/fs/ocfs2/stack_user.c b/fs/ocfs2/stack_user.c index be0a5758bd40ff..f5d83b4f56dd7d 100644 --- a/fs/ocfs2/stack_user.c +++ b/fs/ocfs2/stack_user.c @@ -327,18 +327,14 @@ static int ocfs2_control_install_private(struct file *file) ocfs2_control_this_node = p->op_this_node; running_proto.pv_major = p->op_proto.pv_major; running_proto.pv_minor = p->op_proto.pv_minor; - } - -out_unlock: - mutex_unlock(&ocfs2_control_lock); - - if (!rc && set_p) { - /* We set the global values successfully */ atomic_inc(&ocfs2_control_opened); ocfs2_control_set_handshake_state(file, OCFS2_CONTROL_HANDSHAKE_VALID); } +out_unlock: + mutex_unlock(&ocfs2_control_lock); + return rc; } -- 2.53.0