Date: Tue, 29 Dec 2015 19:20:39 +0000 (UTC) From: "Jonathan T. Looney" <jtl@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r292881 - head/sys/netinet Message-ID: <201512291920.tBTJKdSY046068@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jtl Date: Tue Dec 29 19:20:39 2015 New Revision: 292881 URL: https://svnweb.freebsd.org/changeset/base/292881 Log: When checking the inp_ip_minttl restriction for IPv6 packets, don't check the IPv4 header. CID: 1017920 Differential Revision: https://reviews.freebsd.org/D4727 Reviewed by: bz MFC after: 2 weeks Sponsored by: Juniper Networks Modified: head/sys/netinet/tcp_input.c Modified: head/sys/netinet/tcp_input.c ============================================================================== --- head/sys/netinet/tcp_input.c Tue Dec 29 18:33:43 2015 (r292880) +++ head/sys/netinet/tcp_input.c Tue Dec 29 19:20:39 2015 (r292881) @@ -919,9 +919,10 @@ findpcb: */ if (inp->inp_ip_minttl != 0) { #ifdef INET6 - if (isipv6 && inp->inp_ip_minttl > ip6->ip6_hlim) - goto dropunlock; - else + if (isipv6) { + if (inp->inp_ip_minttl > ip6->ip6_hlim) + goto dropunlock; + } else #endif if (inp->inp_ip_minttl > ip->ip_ttl) goto dropunlock;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201512291920.tBTJKdSY046068>