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 DA21146C4D2; Tue, 21 Jul 2026 15:52:58 +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=1784649180; cv=none; b=hT5Nhoyt7VS2YTO5mdRDq66tVncaTar0Y1IP36nHdXnR9ucJzJrYLdPz3P+zwxM0QqOZSFCPYmcrjjHOGmcMgK/8S3nEBPzKLLQH5jbRlm2P1/wMSfVpLvBxyFpLkaKHMJ7Ul8/iva7BIa+nQvy266z81BqkY9bF8gdT6Mfs/Gc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784649180; c=relaxed/simple; bh=NOd5tYAG7USMD3R0r0v2MVvzy8amM9XG614h1csA8jg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=m8mq9DkkVfi5avkFD1At+tG+ZeV5+SF3dm8ZhGBhkooZ7yqKtPkqT9ZSu8HdSQ7A5ZPj0AKYYg+APWT0PdEmKVmI55ChPOYGVAxjqqMD2Q2QSVu1yug5x4ID+x2+c0b2efesN+EhGPRs9S4sGoHRlANQcdaRhLLdtQSEUMVWV64= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=hJOe4zWY; 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="hJOe4zWY" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0DC6D1F000E9; Tue, 21 Jul 2026 15:52:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1784649178; bh=54JoXu/yTJPzbwRZgdsJyN+FvC9h4OQBJBXxhn6S9Z0=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=hJOe4zWYVa9onzjJzU7Fkr48qr1VrwkC99gpFeQZ1I7hFC7vaTm9H7W7z8bbeQuoB zB4EP/fo+w1xL7a0lxXAbTtwXzdh5Ryg+20mEwnPh/iZ7UfTvydHrciCtHDtvL/lXD fCs05dHqS6dJby4/Qrrw4sWmInRmouUkRyQkJoJQ= 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 7.1 0480/2077] ocfs2: fix race between ocfs2_control_install_private() and ocfs2_control_release() Date: Tue, 21 Jul 2026 17:02:33 +0200 Message-ID: <20260721152604.129884650@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260721152552.646164743@linuxfoundation.org> References: <20260721152552.646164743@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 7.1-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 5803f1dee6790d..91e19d33847c19 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