From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj1-f51.google.com (mail-pj1-f51.google.com [209.85.216.51]) (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 9E0853672A5 for ; Fri, 10 Jul 2026 03:29:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.51 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783654171; cv=none; b=VrRkZ5aS9GpM8iz1S8cPBw/0doRERrcYY+rgtlN5iiRkejXLcqxS2f3yPfzH4psbtRLwb09QU62dvZJNitSGZ0Nl5Cbb06QY9uGkLsQxPPBbIuHSH9EmDAaMkPMFPCqA5hjZ9y5S2LCttnmBJcOstQT71w21e7oofJLItmMd388= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783654171; c=relaxed/simple; bh=5TYO/Wd6tl4LpGGjhxsPJMkGk6HXhbveSmQhJ8eP+h4=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=SDmSxl4ttR3V2RxW0bBa0FRwSCeWd9ewoE45baTiOSKNiDYYQjOhj787d1yJ7ZSAHXEY91aOd1QnqoqlfP2B2jYLzSjspkdINuPThJwwL3POKjQEYR2VbOPnkMTzKeXxtW7+bxVtpWGS9bKY9M1kF2JcGqo6p2Zww422L5Sctfw= 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=eZ9n+QCh; arc=none smtp.client-ip=209.85.216.51 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="eZ9n+QCh" Received: by mail-pj1-f51.google.com with SMTP id 98e67ed59e1d1-3811f512167so658413a91.3 for ; Thu, 09 Jul 2026 20:29:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1783654169; x=1784258969; 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=nxoHTdu7ii+aHwieBMWPqoLypcrKazNhNG1p+ougjzY=; b=eZ9n+QChSWTF8buha7eKLrCOh3t7YHNmue+W5lz9khpVXawq8G82Aqs94p9WAuMcYh 4gWZcP1vyR+m39Yyo/nOLPeczUYGEz9xtqEflI3c9VCZGPr/hmT1S6If8/m/+z86b1zY to1A1KUnljCQZMw9W742F/E96WQeH7smpLlQsDIYPW5iULIG7Zkpt8ysNvrEELAQ2BMT 2iKoGHZiS2JrdyKo/Nidzt6ihn/CDKNL4gNpdi3vpD8lUI668EAcPnxfxorVIGemw7FT Ryin9ajNxYvdOCVNUXFJi9RQ2WSDnfORo9GYX6vhzLNQP4XSSAS4l/tGTmvbBGaewxp8 ekhA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1783654169; x=1784258969; 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=nxoHTdu7ii+aHwieBMWPqoLypcrKazNhNG1p+ougjzY=; b=cvUByzeK5V2wlWpvMA0delPTJPAj0wUIMdGA4H0gb1tqZR0QcY5ZEPz9bw+iIpFsGC 3MzZ5uYH4/6l0ABU6pW+Y9YgvF7k0KYikq8CdumCBtX9cAwd66RTh5FC6O2oPPl7UPza b4YfIC9Gb1gItNNAADj/3xvkoQLM4s+A5NBMj9yBVUU4UZ8j/xZuoVy2hyWLI3TBvbWS cV58jSZqm1k+3XcS7XdLaghKBcDIvD9mcdA8zbXja7s0Ngzbl4WvjHitREfqjCtMTvq1 kVpH8sD98F1ylFRtB7KwGhqjaUiVcNDYnQcx6ONbNdfaPGVDhPOuYyQ0FDUkaf/gcnDM hw2g== X-Forwarded-Encrypted: i=1; AHgh+RrV3nGCMbovnCSGnfns+q8z03Ji3Xh7aCCbvQnLqMuXP58eioE+NcEF+L/2vi4FCpzcnpkP9TkuQ3RLTTc=@vger.kernel.org X-Gm-Message-State: AOJu0Ywr/LnjN79SSPq/sibjOvAfBFU9C9Y+kzm8PLRljFP/AYEk4O4W AGhLXQMI5mNdWtI2DVgvKWNI2/E6BqovBlTHQ3C3zQFPbH4t+d8YSBqI X-Gm-Gg: AfdE7ckz7rYRH57tPUUEqbBdMqfFZ3HdiWqeWt9TKlWUJjR7vA9QoiUfZuXVOyZzbFJ 4t8obJ7oMS96gWIsYDhaS9bKNYAJ1LBD4fGFNJJjVJBNiedDXj1ZpJuXtq2z6nDUH/FQPaFxP29 aGrpD1zvOm7asnEZ3SoF1YzZsoLzRF17vVya/5VMeYyKiaIFFdcOiBygIdR2/c64+C7b0OPsoIa SQvZEYnCEh1rOL3TydxLuUQpGjpmsZ2ky6PcQWhEDze8XjcX3VW9wapFo4cXgVSL2P9adk9L9rW C1tb+3beU0Kou7jiU5yBz/4AVttI2XB0gxYZzYPs6Xbdqpr5qR4+EklEyaUMeAgpHL/Ugo44byH xKL7xvBzkUgxYNZGnDx1Im7azMqlo1m6jLSXtXpZtlGWeGOZ6020uIeVVfIeSy7oOYjachZM+Lz Hb4fOjhW/29djH3D21bQ4iWhpq2+y8j9uuBuFajPVRSjcxmhVmuhcomirBMw== X-Received: by 2002:a17:90a:da8b:b0:380:40b:f30a with SMTP id 98e67ed59e1d1-3893ff630b6mr9874146a91.13.1783654168970; Thu, 09 Jul 2026 20:29:28 -0700 (PDT) Received: from fx.tailc0aff1.ts.net ([206.206.192.132]) by smtp.gmail.com with ESMTPSA id 5a478bee46e88-31174a583bcsm40512297eec.19.2026.07.09.20.29.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Jul 2026 20:29:28 -0700 (PDT) From: Weiming Shi To: Jon Maloy , "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, Tung Nguyen , xmei5@asu.edu, Weiming Shi Subject: [PATCH net v3] tipc: serialize udp bearer replicast list updates Date: Thu, 9 Jul 2026 20:29:02 -0700 Message-ID: <20260710032901.4099197-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. Check for a duplicate peer under the same lock before adding, and remove tipc_udp_is_known_peer(). The old lockless pre-check in tipc_udp_rcast_disc() was racy: two softirqs discovering the same peer could both find it absent and add it twice. Doing the check under rcast_lock in tipc_udp_rcast_add() makes it the single point of truth for both the discovery and the netlink add paths. Fixes: ef20cd4dd163 ("tipc: introduce UDP replicast") Reported-by: Xiang Mei Suggested-by: Tung Nguyen Signed-off-by: Weiming Shi Assisted-by: Claude:claude-opus-4-8 --- v3: (per Tung's review) - Check for a duplicate peer in tipc_udp_rcast_add() under rcast_lock before adding, and remove tipc_udp_is_known_peer(). - This also drops the list_for_each_entry_rcu() change to tipc_udp_is_known_peer() from v2, since the helper is gone. v2: - Narrow the lock to the list mutation. net/tipc/udp_media.c | 45 ++++++++++++++++++-------------------------- 1 file changed, 18 insertions(+), 27 deletions(-) diff --git a/net/tipc/udp_media.c b/net/tipc/udp_media.c index 62ae7f5b5..3a7d9b15c 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: serialize updates to @rcast.list against concurrent updaters */ 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) @@ -278,30 +280,10 @@ static int tipc_udp_send_msg(struct net *net, struct sk_buff *skb, return err; } -static bool tipc_udp_is_known_peer(struct tipc_bearer *b, - struct udp_media_addr *addr) -{ - struct udp_replicast *rcast, *tmp; - struct udp_bearer *ub; - - ub = rcu_dereference_rtnl(b->media_ptr); - if (!ub) { - pr_err_ratelimited("UDP bearer instance not found\n"); - return false; - } - - list_for_each_entry_safe(rcast, tmp, &ub->rcast.list, list) { - if (!memcmp(&rcast->addr, addr, sizeof(struct udp_media_addr))) - return true; - } - - return false; -} - static int tipc_udp_rcast_add(struct tipc_bearer *b, struct udp_media_addr *addr) { - struct udp_replicast *rcast; + struct udp_replicast *rcast, *tmp; struct udp_bearer *ub; ub = rcu_dereference_rtnl(b->media_ptr); @@ -326,7 +308,19 @@ 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; + + /* serialize with other updaters and drop duplicates under the lock */ + spin_lock_bh(&ub->rcast_lock); + list_for_each_entry(tmp, &ub->rcast.list, list) { + if (!memcmp(&tmp->addr, addr, sizeof(*addr))) { + spin_unlock_bh(&ub->rcast_lock); + dst_cache_destroy(&rcast->dst_cache); + kfree(rcast); + return 0; + } + } list_add_rcu(&rcast->list, &ub->rcast.list); + spin_unlock_bh(&ub->rcast_lock); return 0; } @@ -361,9 +355,6 @@ static int tipc_udp_rcast_disc(struct tipc_bearer *b, struct sk_buff *skb) return 0; } - if (likely(tipc_udp_is_known_peer(b, &src))) - return 0; - return tipc_udp_rcast_add(b, &src); } @@ -644,9 +635,6 @@ int tipc_udp_nl_bearer_add(struct tipc_bearer *b, struct nlattr *attr) return -EINVAL; } - if (tipc_udp_is_known_peer(b, &addr)) - return 0; - return tipc_udp_rcast_add(b, &addr); } @@ -679,6 +667,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 +808,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