From owner-svn-src-all@freebsd.org Sun Dec 3 13:39:53 2017 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 09229DFBDBD; Sun, 3 Dec 2017 13:39:53 +0000 (UTC) (envelope-from kostikbel@gmail.com) Received: from kib.kiev.ua (kib.kiev.ua [IPv6:2001:470:d5e7:1::1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 7914C794CA; Sun, 3 Dec 2017 13:39:52 +0000 (UTC) (envelope-from kostikbel@gmail.com) Received: from tom.home (kib@localhost [127.0.0.1]) by kib.kiev.ua (8.15.2/8.15.2) with ESMTPS id vB3DdkRo050049 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Sun, 3 Dec 2017 15:39:46 +0200 (EET) (envelope-from kostikbel@gmail.com) DKIM-Filter: OpenDKIM Filter v2.10.3 kib.kiev.ua vB3DdkRo050049 Received: (from kostik@localhost) by tom.home (8.15.2/8.15.2/Submit) id vB3Ddki5050048; Sun, 3 Dec 2017 15:39:46 +0200 (EET) (envelope-from kostikbel@gmail.com) X-Authentication-Warning: tom.home: kostik set sender to kostikbel@gmail.com using -f Date: Sun, 3 Dec 2017 15:39:46 +0200 From: Konstantin Belousov To: Michael Tuexen Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: Re: svn commit: r324686 - stable/11/sys/netinet Message-ID: <20171203133946.GJ2272@kib.kiev.ua> References: <201710171242.v9HCgHG4030707@repo.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <201710171242.v9HCgHG4030707@repo.freebsd.org> User-Agent: Mutt/1.9.1 (2017-09-22) X-Spam-Status: No, score=-2.0 required=5.0 tests=ALL_TRUSTED,BAYES_00, DKIM_ADSP_CUSTOM_MED,FREEMAIL_FROM,NML_ADSP_CUSTOM_MED autolearn=no autolearn_force=no version=3.4.1 X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on tom.home X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 03 Dec 2017 13:39:53 -0000 On Tue, Oct 17, 2017 at 12:42:17PM +0000, Michael Tuexen wrote: > Author: tuexen > Date: Tue Oct 17 12:42:17 2017 > New Revision: 324686 > URL: https://svnweb.freebsd.org/changeset/base/324686 > > Log: > MFC r322648: > > Ensure inp_vflag is consistently set for TCP endpoints. > > Make sure that the flags INP_IPV4 and INP_IPV6 are consistently set > for inpcbs used for TCP sockets, no matter if the setting is derived > from the net.inet6.ip6.v6only sysctl or the IPV6_V6ONLY socket option. > For UDP this was already done right. > > PR: 221385 > > Modified: > stable/11/sys/netinet/tcp_usrreq.c > Directory Properties: > stable/11/ (props changed) > > Modified: stable/11/sys/netinet/tcp_usrreq.c > ============================================================================== > --- stable/11/sys/netinet/tcp_usrreq.c Tue Oct 17 11:20:32 2017 (r324685) > +++ stable/11/sys/netinet/tcp_usrreq.c Tue Oct 17 12:42:17 2017 (r324686) > @@ -1899,6 +1899,8 @@ tcp_attach(struct socket *so) > #ifdef INET6 > if (inp->inp_vflag & INP_IPV6PROTO) { > inp->inp_vflag |= INP_IPV6; > + if ((inp->inp_flags & IN6P_IPV6_V6ONLY) == 0) > + inp->inp_vflag |= INP_IPV4; > inp->in6p_hops = -1; /* use kernel default */ > } > else I highly suspect that this commit causes the breakage. Example is taken from the 'nestat -f inet6 -n' output, but in fact the problem is much more serious, e.g. squid acls are broken as well: tcp6 0 0 2001:470:1f14:13.23047 2a03:2880:f003:c.443 ESTABLISHED tcp46 0 0 0.0.0.1.22 69.223.183.85.58766 ESTABLISHED The tcp46 and 0.0.0.1 values in the second line are clearly nonsensical.