From owner-svn-src-stable-12@freebsd.org Tue Oct 15 14:29:30 2019 Return-Path: Delivered-To: svn-src-stable-12@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id D410C148A18; Tue, 15 Oct 2019 14:29:30 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 46syVf5K5lz4Ht3; Tue, 15 Oct 2019 14:29:30 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 9A8C51FE0C; Tue, 15 Oct 2019 14:29:30 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x9FETU84007294; Tue, 15 Oct 2019 14:29:30 GMT (envelope-from markj@FreeBSD.org) Received: (from markj@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x9FETUOr007293; Tue, 15 Oct 2019 14:29:30 GMT (envelope-from markj@FreeBSD.org) Message-Id: <201910151429.x9FETUOr007293@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: markj set sender to markj@FreeBSD.org using -f From: Mark Johnston Date: Tue, 15 Oct 2019 14:29:30 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r353560 - stable/12/sys/netinet6 X-SVN-Group: stable-12 X-SVN-Commit-Author: markj X-SVN-Commit-Paths: stable/12/sys/netinet6 X-SVN-Commit-Revision: 353560 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-12@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for only the 12-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Oct 2019 14:29:30 -0000 Author: markj Date: Tue Oct 15 14:29:30 2019 New Revision: 353560 URL: https://svnweb.freebsd.org/changeset/base/353560 Log: Revert r353552 for now. ip6_ctloutput() is missing some requisite changes. Reported by: Jenkins Modified: stable/12/sys/netinet6/ip6_output.c Directory Properties: stable/12/ (props changed) Modified: stable/12/sys/netinet6/ip6_output.c ============================================================================== --- stable/12/sys/netinet6/ip6_output.c Tue Oct 15 14:29:18 2019 (r353559) +++ stable/12/sys/netinet6/ip6_output.c Tue Oct 15 14:29:30 2019 (r353560) @@ -1717,24 +1717,21 @@ do { \ #endif case IPV6_V6ONLY: - INP_WLOCK(inp); + /* + * make setsockopt(IPV6_V6ONLY) + * available only prior to bind(2). + * see ipng mailing list, Jun 22 2001. + */ if (in6p->inp_lport || !IN6_IS_ADDR_UNSPECIFIED(&in6p->in6p_laddr)) { - /* - * The socket is already bound. - */ - INP_WUNLOCK(inp); error = EINVAL; break; } - if (optval) { - inp->inp_flags |= IN6P_IPV6_V6ONLY; + OPTSET(IN6P_IPV6_V6ONLY); + if (optval) in6p->inp_vflag &= ~INP_IPV4; - } else { - inp->inp_flags &= ~IN6P_IPV6_V6ONLY; + else in6p->inp_vflag |= INP_IPV4; - } - INP_WUNLOCK(inp); break; case IPV6_RECVTCLASS: /* cannot mix with RFC2292 XXX */