From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pg1-f174.google.com (mail-pg1-f174.google.com [209.85.215.174]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C0AEB2EEE75 for ; Tue, 7 Jul 2026 16:43:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.174 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783442617; cv=none; b=L7Tuu8qehFPXam76SMGYoXjPdzXZKAObejXErdOVCzryZVymF1pbgpm7mziJTUWx7JFlwMJl97SVdXQDN+5jcfteWNE8+kQ+6lKgeT1ctzKzQv4QQVmFNE/buipX7CmO1Bj1VK8qL9eIgC4QqRTAJBjz1LZHcxa1ag+ecIm+7oc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783442617; c=relaxed/simple; bh=jzHICN97GNQ/H3cgv7acbGCZES1wBsgQKMhHugF5knA=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=Y8mfWvGAaqVMnI4O+alxDvTA9Yaxf6/cJiFyyiQPFNJe/yzUu3QjYRrzylJix4uglSbVEAS/iuAVlHop3WE1zlcmb9ZI29z33OlI5Y3fTYdVAcUXh2dAOYwjQ5Lc3viNeA1sDLrxWlQLdAz+PiFq2YRGedkYr1r+xqfwCjRHZXM= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=YNhFPIYb; arc=none smtp.client-ip=209.85.215.174 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="YNhFPIYb" Received: by mail-pg1-f174.google.com with SMTP id 41be03b00d2f7-c9c80265bd7so2524626a12.1 for ; Tue, 07 Jul 2026 09:43:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1783442615; x=1784047415; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to:content-type; bh=urBcuOuF/SwkK7kb6rHPGAids0fQr1UL/SvOJ60mfhE=; b=YNhFPIYb1LKWIHe+0YqbZ5wQwU4kvSoB7qPYmT8xWfuoBmT8BVaX9fz9A3sol85ETN u+i7XHg4FBGuKKxaPffAP+CkangMH4Chfem6BX7dTj/t74x6z6fvC3ThxF6E0merBSLo xkR7U8kpO8U9J8R9p4Hl+nYcGhCN9OLz0eQMU54ByM2cFW24BGIkQKWlIcHwa4ZExqVJ RYneB3KBlpZ1W5++jQXQkr5qBZlsIIPG70ywNIofs/oL3nYTwjRANHoW8geB4LajzCZP M4+yopE5KprxSUGT/zVovEDoQY/OXpz5QF1ZF+ycUIZM4VBdgyHIXMbOKgs+Yna2Y+cz cS1g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1783442615; x=1784047415; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to:content-type; bh=urBcuOuF/SwkK7kb6rHPGAids0fQr1UL/SvOJ60mfhE=; b=ljYrka8DR/4k3SEI7880+dnEEbX6xz/NyokUSP1J3DGOF+ZGp460evCyGJOUkxDoTD Py0Y9xj+JKPQbMOIkZ1Pewpo9ZDXPPjCA73pXEDm0vm75UzUeqfFGwkk3dlTrJWX9U8u drH8KDfW/ngH3Ec9Xg6I3hj5ddcycEaOqxiFKprvE50H+wf6iC95NB12Fw0r4jmlnvlO RouDs9UYXvbjF5Me4YD5Kv7v3Y889akK7w98uo5qz308zPDuKfPzXkvO206JAKsw9g0s Z/jscEQngDGq4vDovzQqfYOYLh6QqBKVgUiwfpX7pFdyxI0hd/n/C0V//80GUbEio6zv QJnA== X-Forwarded-Encrypted: i=1; AHgh+Rp7fYGypNmvBFDWpDOTHyCtmEkiYA8ynH9UUCnF8MHnuM/VQ4m1OxzveO0p9mpuJchX5JCl6Ry8dX4LS0U=@vger.kernel.org X-Gm-Message-State: AOJu0YzbCeTOcG0S/WJlTCglKB9PtAvgk8qk9Y3kM6863vynueDmajro RUMw2lxuPqZLQ7ctaTRC97h2k8LYRBDnka2/sRK/wF4trWxczNyyb2uX X-Gm-Gg: AfdE7ckuRm1dETl+ZVWucZxe9RFxqXLiG2svx6WV8EEb0PeAphrhTlR0kOJaYyU76xJ I+XfzIQav/BXubNv5mMUr/JPTDqMiXbr5FEg+aIdDey5YbKhsSM9PFQuyZgcy6+g1FcUoWZqMMl p8Xl28Ba2mk5lNUXarG63kZUEgcLQpcMVwKYc+j8ouNWd+eiXIt0QcsRTepvRxQTL1tXSMxd20f PqNs3QpASSzW0mKRD2xUMFEnAVWAwiMxmWzhIXE/iS942RZZVvx2kPXxNxcgr4CSdUtKS+hWRlD Lt8U84lwuYdhDRGgkoOEEYS9Hq3GWZXMGGvhEa5PJ++trdqpOYnk0Z545fMJ7O+p2zeiVq+KbaR Uye1fgXPpLiDzf8Eiv1PgffsYazVxsB0Cj2QTZiJfptBWncjh2PAdb1Cby3T7SxT3paUNxm5RcQ iC+2prYDkFsc1P54slsRJimkKSqUX52712Cp8nH5CnZktEP/jrMpxAUPNbfDkkK5s0289u X-Received: by 2002:a05:6a21:b85:b0:3b4:7b2a:6a0a with SMTP id adf61e73a8af0-3c08ee94f8dmr8406554637.35.1783442615034; Tue, 07 Jul 2026 09:43:35 -0700 (PDT) Received: from fx.tailc0aff1.ts.net ([206.206.192.132]) by smtp.gmail.com with ESMTPSA id a92af1059eb24-13b659d8da9sm15101068c88.14.2026.07.07.09.43.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Jul 2026 09:43:34 -0700 (PDT) From: Weiming Shi To: Jon Maloy , Tung Nguyen , "David S . Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman Cc: netdev@vger.kernel.org, tipc-discussion@lists.sourceforge.net, linux-kernel@vger.kernel.org, Xiang Mei , Weiming Shi Subject: [PATCH net v2] tipc: serialize udp bearer replicast list updates Date: Tue, 7 Jul 2026 09:42:49 -0700 Message-ID: <20260707164248.821265-2-bestswngs@gmail.com> X-Mailer: git-send-email 2.43.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit tipc_udp_rcast_add() and cleanup_bearer() both update ub->rcast.list with list_add_rcu() / list_del_rcu(), but nothing serializes them. The add runs from the encap receive softirq (via tipc_udp_rcast_disc()) without rtnl_lock(), so it can race the cleanup delete and corrupt the list: list_del corruption. prev->next should be ffff8880298d7ab8, but was ffff88802449ad38. (prev=ffff888027e3ec98) kernel BUG at lib/list_debug.c:62! RIP: __list_del_entry_valid_or_report+0x17a/0x200 Workqueue: events cleanup_bearer Call Trace: cleanup_bearer (net/tipc/udp_media.c:811) process_one_work (kernel/workqueue.c:3302) worker_thread (kernel/workqueue.c:3466) The bearer can be enabled from an unprivileged user namespace, as the TIPCv2 generic-netlink ops carry no GENL_ADMIN_PERM. Add a spinlock to struct udp_bearer and take it around the list_add_rcu() in tipc_udp_rcast_add() and the list_del_rcu() loop in cleanup_bearer() so the two writers can no longer corrupt the list. While here, switch the read-only walk in tipc_udp_is_known_peer() to list_for_each_entry_rcu(); it never deletes, so list_for_each_entry_safe() was misleading. Fixes: ef20cd4dd163 ("tipc: introduce UDP replicast") Reported-by: Xiang Mei Suggested-by: Tung Nguyen Assisted-by: Claude:claude-opus-4-8 Signed-off-by: Weiming Shi --- v2: (per Tung's review) - Narrow the lock to just list_add_rcu(). - Drop the under-lock dup re-check; serializing the writers is enough. - Use list_for_each_entry_rcu() in tipc_udp_is_known_peer(). net/tipc/udp_media.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/net/tipc/udp_media.c b/net/tipc/udp_media.c index 62ae7f5b5840..c6aa8c3c54ce 100644 --- a/net/tipc/udp_media.c +++ b/net/tipc/udp_media.c @@ -94,6 +94,7 @@ struct udp_replicast { * @ifindex: local address scope * @work: used to schedule deferred work on a bearer * @rcast: associated udp_replicast container + * @rcast_lock: serializes updates to @rcast.list */ struct udp_bearer { struct tipc_bearer __rcu *bearer; @@ -101,6 +102,7 @@ struct udp_bearer { u32 ifindex; struct work_struct work; struct udp_replicast rcast; + spinlock_t rcast_lock; /* protects rcast.list */ }; static int tipc_udp_is_mcast_addr(struct udp_media_addr *addr) @@ -281,7 +283,7 @@ static int tipc_udp_send_msg(struct net *net, struct sk_buff *skb, static bool tipc_udp_is_known_peer(struct tipc_bearer *b, struct udp_media_addr *addr) { - struct udp_replicast *rcast, *tmp; + struct udp_replicast *rcast; struct udp_bearer *ub; ub = rcu_dereference_rtnl(b->media_ptr); @@ -290,7 +292,7 @@ static bool tipc_udp_is_known_peer(struct tipc_bearer *b, return false; } - list_for_each_entry_safe(rcast, tmp, &ub->rcast.list, list) { + list_for_each_entry_rcu(rcast, &ub->rcast.list, list) { if (!memcmp(&rcast->addr, addr, sizeof(struct udp_media_addr))) return true; } @@ -326,7 +328,9 @@ static int tipc_udp_rcast_add(struct tipc_bearer *b, pr_info("New replicast peer: %pI6\n", &rcast->addr.ipv6); #endif b->bcast_addr.broadcast = TIPC_REPLICAST_SUPPORT; + spin_lock_bh(&ub->rcast_lock); list_add_rcu(&rcast->list, &ub->rcast.list); + spin_unlock_bh(&ub->rcast_lock); return 0; } @@ -679,6 +683,7 @@ static int tipc_udp_enable(struct net *net, struct tipc_bearer *b, return -ENOMEM; INIT_LIST_HEAD(&ub->rcast.list); + spin_lock_init(&ub->rcast_lock); if (!attrs[TIPC_NLA_BEARER_UDP_OPTS]) goto err; @@ -819,10 +824,12 @@ static void cleanup_bearer(struct work_struct *work) struct udp_replicast *rcast, *tmp; struct tipc_net *tn; + spin_lock_bh(&ub->rcast_lock); list_for_each_entry_safe(rcast, tmp, &ub->rcast.list, list) { list_del_rcu(&rcast->list); call_rcu_hurry(&rcast->rcu, rcast_free_rcu); } + spin_unlock_bh(&ub->rcast_lock); tn = tipc_net(sock_net(ub->sk)); -- 2.43.0