From nobody Wed Feb 09 11:21:38 2022 X-Original-To: current@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 56B7F19BB55A for ; Wed, 9 Feb 2022 11:21:43 +0000 (UTC) (envelope-from tuexen@freebsd.org) Received: from drew.franken.de (drew.ipv6.franken.de [IPv6:2001:638:a02:a001:20e:cff:fe4a:feaa]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "*.franken.de", Issuer "Sectigo RSA Domain Validation Secure Server CA" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JtyBZ4hmzz4fgB for ; Wed, 9 Feb 2022 11:21:42 +0000 (UTC) (envelope-from tuexen@freebsd.org) Received: from smtpclient.apple (unknown [IPv6:2a02:8109:1140:c3d:e02c:adf0:dce1:9c85]) (Authenticated sender: macmic) by mail-n.franken.de (Postfix) with ESMTPSA id 8999F721E2807; Wed, 9 Feb 2022 12:21:39 +0100 (CET) Content-Type: text/plain; charset=us-ascii List-Id: Discussions about the use of FreeBSD-current List-Archive: https://lists.freebsd.org/archives/freebsd-current List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-current@freebsd.org Mime-Version: 1.0 (Mac OS X Mail 15.0 \(3693.60.0.1.1\)) Subject: Re: fd7daa727126 breaks buildkernel when KERN_TLS is not defined From: tuexen@freebsd.org In-Reply-To: <20220209114310.1a93fa85@ernst.home> Date: Wed, 9 Feb 2022 12:21:38 +0100 Cc: current@freebsd.org Content-Transfer-Encoding: quoted-printable Message-Id: <1531B30A-E253-452F-8AB5-669DD5CCF0AC@freebsd.org> References: <20220209114310.1a93fa85@ernst.home> To: gljennjohn@gmail.com X-Mailer: Apple Mail (2.3693.60.0.1.1) X-Spam-Status: No, score=-2.9 required=5.0 tests=ALL_TRUSTED,BAYES_00, T_SCC_BODY_TEXT_LINE autolearn=disabled version=3.4.1 X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on mail-n.franken.de X-Rspamd-Queue-Id: 4JtyBZ4hmzz4fgB X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=softfail (mx1.freebsd.org: 2001:638:a02:a001:20e:cff:fe4a:feaa is neither permitted nor denied by domain of tuexen@freebsd.org) smtp.mailfrom=tuexen@freebsd.org X-Spamd-Result: default: False [-2.60 / 15.00]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; FREEFALL_USER(0.00)[tuexen]; MV_CASE(0.50)[]; MID_RHS_MATCH_FROM(0.00)[]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; DMARC_NA(0.00)[freebsd.org]; R_SPF_SOFTFAIL(0.00)[~all:c]; NEURAL_HAM_LONG(-1.00)[-1.000]; TO_MATCH_ENVRCPT_SOME(0.00)[]; NEURAL_HAM_SHORT(-1.00)[-1.000]; RCPT_COUNT_TWO(0.00)[2]; FROM_NO_DN(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-0.999]; MLMMJ_DEST(0.00)[current]; FREEMAIL_TO(0.00)[gmail.com]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; ASN(0.00)[asn:680, ipnet:2001:638::/32, country:DE]; RCVD_COUNT_TWO(0.00)[2]; RCVD_TLS_ALL(0.00)[] X-ThisMailContainsUnwantedMimeParts: N > On 9. Feb 2022, at 11:43, Gary Jennejohn wrote: >=20 > Commit fd7daa727126 to /usr/src/sys/netinet/tcp_usrreq.c breaks = buildkernel > when KERN_TLS is not defined. Fixed in = https://cgit.FreeBSD.org/src/commit/?id=3D528c76492402d9be8ec83a0a769f0d70= e2a32f61 Thanks for reporting. Best regards Michael > This patch fixes it for me: >=20 > --- tcp_usrreq.c.orig 2022-02-09 10:25:46.851034000 +0000 > +++ tcp_usrreq.c 2022-02-09 10:30:27.541058000 +0000 > @@ -2119,12 +2119,12 @@ > int > tcp_default_ctloutput(struct inpcb *inp, struct sockopt *sopt) > { > - struct socket *so =3D inp->inp_socket; > struct tcpcb *tp =3D intotcpcb(inp); > int error, opt, optval; > u_int ui; > struct tcp_info ti; > #ifdef KERN_TLS > + struct socket *so =3D inp->inp_socket; > struct tls_enable tls; > #endif > char *pbuf, buf[TCP_LOG_ID_LEN]; > @@ -2136,7 +2136,9 @@ > INP_WLOCK_ASSERT(inp); > KASSERT((inp->inp_flags & (INP_TIMEWAIT | INP_DROPPED)) =3D=3D = 0, > ("inp_flags =3D=3D %x", inp->inp_flags)); > +#ifdef KERN_TLS > KASSERT(so !=3D NULL, ("inp_socket =3D=3D NULL")); > +#endif >=20 > switch (sopt->sopt_level) { > #ifdef INET6 >=20 > --=20 > Gary Jennejohn >=20