Import patch from [1] while it doesn't reach stable/10

It fixes a race on IPsec [1] https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=204437
pfsense · Nov 24, 2015 · 2b2f5ac · 2b2f5ac
1 parent 0198089
commit 2b2f5ac
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/sys/netinet/in_pcb.c b/sys/netinet/in_pcb.c
@@ -1148,8 +1148,17 @@ in_pcbrele_wlocked(struct inpcb *inp)
 
 	INP_WLOCK_ASSERT(inp);
 
-	if (refcount_release(&inp->inp_refcount) == 0)
+	if (refcount_release(&inp->inp_refcount) == 0) {
+		/*
+		 * If the inpcb has been freed, let the caller know, even if
+		 * this isn't the last reference.
+		 */
+		if (inp->inp_flags2 & INP_FREED) {
+			INP_WUNLOCK(inp);
+			return (1);
+		}
 		return (0);
+	}
 
 	KASSERT(inp->inp_socket == NULL, ("%s: inp_socket != NULL", __func__));