From nobody Mon Jul 24 15:45:53 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4R8kyn2mYQz4nsr2; Mon, 24 Jul 2023 15:45:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4R8kyn2LSpz3mMt; Mon, 24 Jul 2023 15:45:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690213553; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ALhKg0fX319YvYU3ydqSBJexkffAABaNPm3xPKKTmYU=; b=GfixacA48aMvdnE2RaYs155FugK7aiqnSAIhPpjHjDJa8yppw2B418KnvXjZMSIQytbqQq 96Ezp+YUr5bFNNFAYB6xHMPt1ZQBPtFcRelgteOgQ6vmY/tZ4EhgbUydLwvBOf4yLA5i4z c7HR4uA3DL67PeKYyodpzan2uefiLoC5aN5ivgMjaqlme/yl636tlDvaoSeoe7BHKb0oM7 nFfYj5Dh5SmkeouZGVs79gWNgQH932wMixN1MTDIiJynwLZe2IL6U/TQgx8iYWwGqV2jBb xf0T+GVxpURA98WkYb/nOX1Usesw9uzj3suqxIhq1aNhSfZk/8NeYaNw7BBRug== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690213553; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ALhKg0fX319YvYU3ydqSBJexkffAABaNPm3xPKKTmYU=; b=pUvwbqqsQjdx3OGDQ3JILskN3rB90694pyezDVjx9PRtg1kNd2Ry0yLJMVymtlm+bBg5Zi 6Kq5VoKxAdEcXZCWLTPeQ9P78meuVg08gxBY7YvYCyxw5dwAhBzRkY9j5xcPpxhUrVpab1 w2DrtRpet8D6JBMOxJznqY6R3aXTOPHClXC+6cqShWKSegMmKZmjS1ukl61gkMhPZxXoVz 9vLv16dL0qV1zEAhyljRPDMfO/Bod6qV8pSaqxQXYWogVECeOTHqKozRkvhqLmzHwuby3T CNj6SZpAo0gP+Kinupgr8+sBRLGnS2yzWRSJCEQkjyiHcRZ5o9cnXeV5w3SYzQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690213553; a=rsa-sha256; cv=none; b=EFN7Prb6aDvRmxjdXdGE+SfuE0ALBdM5xQZrePEs8rY4np1rdjFSYqjs9PbQThC57kEj2N qqD7AADq6e5gj+5HxjSrC9mhGun99SEbemh9OndgYgOO8591OgZ9BmFvCwvOCl1d9QIQ76 D7WiYmMojwF8IKjCRQkORCrY1+c7KlrTfJa1hidZM2Iu+mWetIE6XCP+pCJc5MLM263FwJ 8DtgpqPcVRaCW2Qbyeyri3+/RS3dEQ+AJ9lpcv3rH9xX5DRz0Y05JRMXfRtMwDwTr3kgdY fHEdh7B/ZY1aB2/cj9YqNFtrM/sGWGPlIGlxp3eI7zcuLgs33hz4QqiG8ReQTA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4R8kyn1MD7zNZM; Mon, 24 Jul 2023 15:45:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36OFjrVN079663; Mon, 24 Jul 2023 15:45:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36OFjrmt079662; Mon, 24 Jul 2023 15:45:53 GMT (envelope-from git) Date: Mon, 24 Jul 2023 15:45:53 GMT Message-Id: <202307241545.36OFjrmt079662@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: 9c9a76dc6873 - main - mld: always commit state changes on leaving List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9c9a76dc6873427b14f6c84397dd60ea8e529d8d Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=9c9a76dc6873427b14f6c84397dd60ea8e529d8d commit 9c9a76dc6873427b14f6c84397dd60ea8e529d8d Author: Kristof Provost AuthorDate: 2023-07-20 07:41:45 +0000 Commit: Kristof Provost CommitDate: 2023-07-24 14:47:34 +0000 mld: always commit state changes on leaving Resolve a race condition where we'd lose the Solicited-node multicast group subscription if we assigned the same IPv6 address twice. PR: 233683 Reviewed by: ae MFC after: 1 week Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D41124 --- sys/netinet6/mld6.c | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/sys/netinet6/mld6.c b/sys/netinet6/mld6.c index 63f4e33ac64d..82bb69588fa2 100644 --- a/sys/netinet6/mld6.c +++ b/sys/netinet6/mld6.c @@ -2164,13 +2164,10 @@ static void mld_final_leave(struct in6_multi *inm, struct mld_ifsoftc *mli) { struct epoch_tracker et; - int syncstates; #ifdef KTR char ip6tbuf[INET6_ADDRSTRLEN]; #endif - syncstates = 1; - CTR4(KTR_MLD, "%s: final leave %s on ifp %p(%s)", __func__, ip6_sprintf(ip6tbuf, &inm->in6m_addr), inm->in6m_ifp, if_name(inm->in6m_ifp)); @@ -2234,7 +2231,6 @@ mld_final_leave(struct in6_multi *inm, struct mld_ifsoftc *mli) inm->in6m_state = MLD_LEAVING_MEMBER; inm->in6m_sctimer = 1; V_state_change_timers_running6 = 1; - syncstates = 0; } break; } @@ -2246,15 +2242,13 @@ mld_final_leave(struct in6_multi *inm, struct mld_ifsoftc *mli) break; } - if (syncstates) { - in6m_commit(inm); - CTR3(KTR_MLD, "%s: T1 -> T0 for %s/%s", __func__, - ip6_sprintf(ip6tbuf, &inm->in6m_addr), - if_name(inm->in6m_ifp)); - inm->in6m_st[1].iss_fmode = MCAST_UNDEFINED; - CTR3(KTR_MLD, "%s: T1 now MCAST_UNDEFINED for %p/%s", - __func__, &inm->in6m_addr, if_name(inm->in6m_ifp)); - } + in6m_commit(inm); + CTR3(KTR_MLD, "%s: T1 -> T0 for %s/%s", __func__, + ip6_sprintf(ip6tbuf, &inm->in6m_addr), + if_name(inm->in6m_ifp)); + inm->in6m_st[1].iss_fmode = MCAST_UNDEFINED; + CTR3(KTR_MLD, "%s: T1 now MCAST_UNDEFINED for %p/%s", + __func__, &inm->in6m_addr, if_name(inm->in6m_ifp)); } /*