From owner-svn-src-all@freebsd.org Mon Nov 25 22:25:35 2019 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 3424B1BC14A; Mon, 25 Nov 2019 22:25:35 +0000 (UTC) (envelope-from rlibby@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) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 47MM730hMnz41mS; Mon, 25 Nov 2019 22:25:35 +0000 (UTC) (envelope-from rlibby@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id F05A41B79A; Mon, 25 Nov 2019 22:25:34 +0000 (UTC) (envelope-from rlibby@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id xAPMPYXu077556; Mon, 25 Nov 2019 22:25:34 GMT (envelope-from rlibby@FreeBSD.org) Received: (from rlibby@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id xAPMPYDV077555; Mon, 25 Nov 2019 22:25:34 GMT (envelope-from rlibby@FreeBSD.org) Message-Id: <201911252225.xAPMPYDV077555@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rlibby set sender to rlibby@FreeBSD.org using -f From: Ryan Libby Date: Mon, 25 Nov 2019 22:25:34 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r355103 - head/sys/netinet X-SVN-Group: head X-SVN-Commit-Author: rlibby X-SVN-Commit-Paths: head/sys/netinet X-SVN-Commit-Revision: 355103 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Nov 2019 22:25:35 -0000 Author: rlibby Date: Mon Nov 25 22:25:34 2019 New Revision: 355103 URL: https://svnweb.freebsd.org/changeset/base/355103 Log: in_mcast.c: need if_addr_lock around inm_release_deferred Apply a similar fix as for in6_mcast.c. Reviewed by: hselasky Sponsored by: Dell EMC Isilon Differential Revision: https://reviews.freebsd.org/D20740 Modified: head/sys/netinet/in_mcast.c Modified: head/sys/netinet/in_mcast.c ============================================================================== --- head/sys/netinet/in_mcast.c Mon Nov 25 22:25:10 2019 (r355102) +++ head/sys/netinet/in_mcast.c Mon Nov 25 22:25:34 2019 (r355103) @@ -1268,7 +1268,9 @@ in_joingroup_locked(struct ifnet *ifp, const struct in if (error) { CTR2(KTR_IGMPV3, "%s: dropping ref on %p", __func__, inm); + IF_ADDR_WLOCK(ifp); inm_release_deferred(inm); + IF_ADDR_WUNLOCK(ifp); } else { *pinm = inm; } @@ -2247,7 +2249,9 @@ out_inp_unlocked: if (is_new && imf) { if (imf->imf_inm != NULL) { IN_MULTI_LIST_LOCK(); + IF_ADDR_WLOCK(ifp); inm_release_deferred(imf->imf_inm); + IF_ADDR_WUNLOCK(ifp); IN_MULTI_LIST_UNLOCK(); } ip_mfilter_free(imf);