svn commit: r292881 - head/sys/netinet

[Jonathan T. Looney]

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;