svn commit: r186591 - user/kmacy/HEAD_fast_net/sys/netinet
Kip Macy
kmacy at FreeBSD.org
Tue Dec 30 05:29:44 UTC 2008
Author: kmacy
Date: Tue Dec 30 05:29:43 2008
New Revision: 186591
URL: http://svn.freebsd.org/changeset/base/186591
Log:
validate so before checking options in tcp_input
Modified:
user/kmacy/HEAD_fast_net/sys/netinet/tcp_input.c
Modified: user/kmacy/HEAD_fast_net/sys/netinet/tcp_input.c
==============================================================================
--- user/kmacy/HEAD_fast_net/sys/netinet/tcp_input.c Tue Dec 30 05:08:05 2008 (r186590)
+++ user/kmacy/HEAD_fast_net/sys/netinet/tcp_input.c Tue Dec 30 05:29:43 2008 (r186591)
@@ -585,9 +585,9 @@ findpcb:
goto dropwithreset;
}
INP_WLOCK(inp);
- if (!(so->so_options & SO_ACCEPTCONN)
- && !(inp->inp_flags & INP_HW_FLOWID)
- && (m->m_flags & M_FLOWID)) {
+ if (!(inp->inp_flags & INP_HW_FLOWID)
+ && (m->m_flags & M_FLOWID) &&
+ ((so == NULL) || !(so->so_options & SO_ACCEPTCONN))) {
inp->inp_flags |= INP_HW_FLOWID;
inp->inp_flags &= ~INP_SW_FLOWID;
inp->inp_flowid = m->m_pkthdr.flowid;
More information about the svn-src-user
mailing list