Merge remote-tracking branch 'freebsd/stable/12' into hardened/12-stable/master

sys/kern/kern_timeout.c

@@ -673,7 +673,7 @@ softclock_call_cc(struct callout *c, struct callout_cpu *cc,
 	    ("softclock_call_cc: act %p %x", c, c->c_flags));
 	class = (c->c_lock != NULL) ? LOCK_CLASS(c->c_lock) : NULL;
 	lock_status = 0;
-	if (c->c_flags & CALLOUT_SHAREDLOCK) {
+	if (c->c_iflags & CALLOUT_SHAREDLOCK) {
 		if (class == &lock_class_rm)
 			lock_status = (uintptr_t)&tracker;
 		else

sys/netpfil/pf/if_pfsync.c

@@ -1737,7 +1737,7 @@ pfsync_defer(struct pf_kstate *st, struct mbuf *m)
 {
 	struct pfsync_softc *sc = V_pfsyncif;
 	struct pfsync_deferral *pd;
-	struct pfsync_bucket *b = pfsync_get_bucket(sc, st);
+	struct pfsync_bucket *b;
 
 	if (m->m_flags & (M_BCAST|M_MCAST))
 		return (0);
@@ -1745,6 +1745,8 @@ pfsync_defer(struct pf_kstate *st, struct mbuf *m)
 	if (sc == NULL)
 		return (0);
 
+	b = pfsync_get_bucket(sc, st);
+
 	PFSYNC_LOCK(sc);
 
 	if (!(sc->sc_ifp->if_drv_flags & IFF_DRV_RUNNING) ||

sys/netpfil/pf/pf_if.c

@@ -549,8 +549,7 @@ pfi_dynaddr_setup(struct pf_addr_wrap *aw, sa_family_t af)
 		pfr_detach_table(dyn->pfid_kt);
 	if (ruleset != NULL)
 		pf_remove_if_empty_kruleset(ruleset);
-	if (dyn->pfid_kif != NULL)
-		pfi_kkif_unref(dyn->pfid_kif);
+	pfi_kkif_unref(dyn->pfid_kif);
 	free(dyn, PFI_MTYPE);
 
 	return (rv);

sys/netpfil/pf/pf_table.c

@@ -2211,6 +2211,7 @@ pfr_pool_get(struct pfr_ktable *kt, int *pidx, struct pf_addr *counter,
 	int			 idx = -1, use_counter = 0;
 
 	MPASS(pidx != NULL);
+	MPASS(counter != NULL);
 
 	switch (af) {
 	case AF_INET:
@@ -2230,7 +2231,7 @@ pfr_pool_get(struct pfr_ktable *kt, int *pidx, struct pf_addr *counter,
 		return (-1);
 
 	idx = *pidx;
-	if (counter != NULL && idx >= 0)
+	if (idx >= 0)
 		use_counter = 1;
 	if (idx < 0)
 		idx = 0;