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=1794063620; b=pmERtONwb0h+nf1TE/8iiaDs/ui60c9MOOIOIkkHJSWTd0KwLeqPf62+cy0IWknYx3o1 rt7T7f0N2jM1/mbY252NBKCC79BaR9SkYIxCFWbYV/7PDYJny1VqvMM+DUaHV2A+O87K1 44HSww29rvN4Wf+DL1NRHonz9hv7y4KQk6tDlONn7MORvnLLLZ6uVoRlDq+g+cVspNm6l 99cyghGkBO9yFPUR3JNoJob/XIWN3fVReunnqqQobPs0UxtHjc7utHhD9VKnNb0zJV0Ow Oqqc+O3VZSdOSd7CXdbNvWm0fsOh2dUh3FNnEpOcsAC0flq/H2Z30FhOmuFTx0jbFSw== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1794063620; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: In-Reply-To:References:User-Agent:X-stable:X-Patchwork-Hint: MIME-Version:Content-Transfer-Encoding; bh=1abXxPfUbLjDxjoz2qQM2TRDrlDdJsMaDWU4SKxmXw4=; b=j/9BYVgXpad8H6qjnga09rig4wxeV7pttOk/iswpi2Vqu0ewQzQx79KtxtkaW03b4Oqc xNin0SoX94E61q2Hb/98t6x8NwO8a0UQTlgGvwUaWQIulhJdLbOGAekhxCqmgCnsqPZzo laiDNaPglVrKeoJ4NKr4XqYVNhzVNyE/YkwDJ5ey/Qnhx/3k7Aqq4+H0ngs4vvdxNJ+fv IZCdShrxtllqDR/WQJyQ7kuOeHpoPL7JRm5iRtzjuLuPhl2eprM9RlmkNwf/VyTVxF0SZ EhMSGYx6ttXQg6s+Ch0hInAiHmiqaCocqRGqnHm+gZ6+pyylrPQvBujoO7jCmtY+tBA== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=b9m2nhIB; 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 B2038606EE9F; Sat, 7 Nov 2026 15:00:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=b9m2nhIB Received: by smtp.kernel.org (Postfix) with ESMTPSA id 674151F0089F; Sat, 7 Nov 2026 15:00:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1794063619; bh=1abXxPfUbLjDxjoz2qQM2TRDrlDdJsMaDWU4SKxmXw4=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=b9m2nhIBCfweZexBayhuSi/kQ7riw1VK+ztnsyAIiG/NgM2fpD/dJYFVSD8o56J1J fy3rfgsoC4x5hwY+6YrQmrzHABzyYDd5JOiHLpeDBuXiLhc8fiJf90CyJkwW0wi9dY gFFsgxYVGfOrNjUr9UCCze+Z+26yP0qaueDhTQ2o= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Cen Zhang , Andrew Morton , Joseph Qi , Mark Fasheh , Joel Becker , Heming Zhao , Jia-Ju Bai , jjzuming@gmail.com, Sasha Levin Subject: [PATCH 6.18 740/869] ocfs2/cluster: remove zero-address nodes from IP tree on teardown Date: Sat, 7 Nov 2026 08:57:02 -0500 Message-ID: <20261107134917.907650918@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261107134852.069646174@linuxfoundation.org> References: <20261107134852.069646174@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore 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 6.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Cen Zhang [ Upstream commit 5dd57e77eff4ba3e85b3df126a55417c88245708 ] o2nm_node_ipv4_address_store() accepts 0.0.0.0. It sets O2NM_NODE_ATTR_ADDRESS and links nd_ip_node into cl_node_ip_tree under cl_nodes_lock, but o2nm_node_group_drop_item() uses nd_ipv4_address as a membership test. A zero address therefore leaves the rbtree node linked when config_item_put() releases and frees struct o2nm_node. A later address store or IP lookup can then walk the stale node and dereference freed memory. During teardown, drop_item takes cl_nodes_lock, skips rb_erase() for the zero key, and then calls config_item_put(). A later o2nm_node_ipv4_address_store() duplicate check or o2nm_get_node_by_ip() lookup takes the same lock and walks the stale cl_node_ip_tree entry. Use O2NM_NODE_ATTR_ADDRESS for teardown so every published nd_ip_node is erased before configfs can release the node, without rejecting 0.0.0.0 or changing lookup semantics. Link: https://lore.kernel.org/pm-ocfs2-node-ip-rbtree-zero-address-uaf-v5-e7f64be16b7c3b0988d1@gmail.com Fixes: 0c83ed8eeb28 ("[PATCH] OCFS2: The Second Oracle Cluster Filesystem") Signed-off-by: Cen Zhang Signed-off-by: Andrew Morton Reviewed-by: Joseph Qi Assisted-by: LLM Cc: Mark Fasheh Cc: Joel Becker Cc: Heming Zhao Cc: Jia-Ju Bai Cc: Cc: Signed-off-by: Sasha Levin --- fs/ocfs2/cluster/nodemanager.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/fs/ocfs2/cluster/nodemanager.c b/fs/ocfs2/cluster/nodemanager.c index 87aeb1a7a90ae..bfc7c0fb2be05 100644 --- a/fs/ocfs2/cluster/nodemanager.c +++ b/fs/ocfs2/cluster/nodemanager.c @@ -626,8 +626,11 @@ static void o2nm_node_group_drop_item(struct config_group *group, write_lock(&cluster->cl_nodes_lock); - /* XXX sloppy */ - if (node->nd_ipv4_address) + /* + * 0.0.0.0 is a valid configured address, so nd_ipv4_address does + * not tell us whether nd_ip_node was published in the IP tree. + */ + if (test_bit(O2NM_NODE_ATTR_ADDRESS, &node->nd_set_attributes)) rb_erase(&node->nd_ip_node, &cluster->cl_node_ip_tree); /* nd_num might be 0 if the node number hasn't been set.. */ -- 2.53.0