Date: Tue, 30 Dec 2008 05:29:43 +0000 (UTC) From: Kip Macy <kmacy@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r186591 - user/kmacy/HEAD_fast_net/sys/netinet Message-ID: <200812300529.mBU5Thao077864@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200812300529.mBU5Thao077864>