svn commit: r368054 - stable/12/sys/net

[Kristof Provost]

Author: kp
Date: Thu Nov 26 10:17:56 2020
New Revision: 368054
URL: https://svnweb.freebsd.org/changeset/base/368054

Log:
  Add missing NET_EPOCH_EXIT() to if_bridge
  
  In r367706 one return in bridge_input() did not NET_EPOCH_EXIT(), which caused
  seemingly random panics on the next use of NET_EPOCH.
  
  Direct commit to stable/12, because this code is different in CURRENT.

Modified:
  stable/12/sys/net/if_bridge.c

Modified: stable/12/sys/net/if_bridge.c
==============================================================================
--- stable/12/sys/net/if_bridge.c	Thu Nov 26 09:07:45 2020	(r368053)
+++ stable/12/sys/net/if_bridge.c	Thu Nov 26 10:17:56 2020	(r368054)
@@ -2528,6 +2528,7 @@ bridge_input(struct ifnet *ifp, struct mbuf *m)
 			     OR_PFIL_HOOKED_INET6)) {			\
 				if (bridge_pfil(&m, NULL, ifp,		\
 				    PFIL_IN) != 0 || m == NULL) {	\
+					NET_EPOCH_EXIT_ET(et);  \
 					return (NULL);			\
 				}					\
 				eh = mtod(m, struct ether_header *);	\