svn commit: r353313 - head/sys/netinet

[Gleb Smirnoff]

Author: glebius
Date: Tue Oct  8 16:59:17 2019
New Revision: 353313
URL: https://svnweb.freebsd.org/changeset/base/353313

Log:
  Quickly plug another regression from r353292. Again, multicast locking needs
  lots of work...
  
  Reported by:	pho

Modified:
  head/sys/netinet/in_mcast.c

Modified: head/sys/netinet/in_mcast.c
==============================================================================
--- head/sys/netinet/in_mcast.c	Tue Oct  8 16:45:56 2019	(r353312)
+++ head/sys/netinet/in_mcast.c	Tue Oct  8 16:59:17 2019	(r353313)
@@ -2195,12 +2195,14 @@ inp_join_group(struct inpcb *inp, struct sockopt *sopt
 	 * Begin state merge transaction at IGMP layer.
 	 */
 	if (is_new) {
+		struct epoch_tracker et;
+
 		in_pcbref(inp);
 		INP_WUNLOCK(inp);
-
+		NET_EPOCH_ENTER(et);
 		error = in_joingroup_locked(ifp, &gsa->sin.sin_addr, imf,
 		    &imf->imf_inm);
-
+		NET_EPOCH_EXIT(et);
 		INP_WLOCK(inp);
 		if (in_pcbrele_wlocked(inp)) {
 			error = ENXIO;