d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make sure that either inp is NULL or we have obtained a lock on it before

Browse Source 
jumping to dropunlock to avoid a panic.  While here move the calls to
ipsec4_in_reject() and ipsec6_in_reject() so they are after we obtain
the lock on inp.

Original patch to avoid panic:	pjd
Review of locking adjustments:	gnn, sam
Approved by:			re (rwatson)
This commit is contained in:
kensmith 2007-09-10 14:49:32 +00:00
parent 200ce01ddb
commit 671d1148ba
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
sys/netinet/tcp_input.c
View File

@ -448,19 +448,6 @@ tcp_input(struct mbuf *m, int off0)
m->m_pkthdr.rcvif);
}
#ifdef IPSEC
#ifdef INET6
if (isipv6 && inp != NULL && ipsec6_in_reject(m, inp)) {
ipsec6stat.in_polvio++;
goto dropunlock;
} else
#endif /* INET6 */
if (inp != NULL && ipsec4_in_reject(m, inp)) {
ipsec4stat.in_polvio++;
goto dropunlock;
}
#endif /* IPSEC */
/*
* If the INPCB does not exist then all data in the incoming
* segment is discarded and an appropriate RST is sent back.
@ -489,6 +476,19 @@ tcp_input(struct mbuf *m, int off0)
}
INP_LOCK(inp);
#ifdef IPSEC
#ifdef INET6
if (isipv6 && ipsec6_in_reject(m, inp)) {
ipsec6stat.in_polvio++;
goto dropunlock;
} else
#endif /* INET6 */
if (ipsec4_in_reject(m, inp) != 0) {
ipsec4stat.in_polvio++;
goto dropunlock;
}
#endif /* IPSEC */
/*
* Check the minimum TTL for socket.
*/