From nobody Wed Feb 9 10:43:10 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 9E61619A175D for ; Wed, 9 Feb 2022 10:43:13 +0000 (UTC) (envelope-from gljennjohn@gmail.com) Received: from mail-ej1-x62c.google.com (mail-ej1-x62c.google.com [IPv6:2a00:1450:4864:20::62c]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JtxL83d24z3rK3 for ; Wed, 9 Feb 2022 10:43:12 +0000 (UTC) (envelope-from gljennjohn@gmail.com) Received: by mail-ej1-x62c.google.com with SMTP id a8so5962732ejc.8 for ; Wed, 09 Feb 2022 02:43:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=date:from:to:subject:message-id:reply-to:mime-version :content-transfer-encoding; bh=T2fvwW6+4A+6fSxaUICLbfRxSYRnO1tVLUNvl06GUWk=; b=LeGzIC0jB7LppkFnXOrpLAQtpC7KqK4/6298yFjpEZklBdTsONaRz4TeT2iT+80DLx T+zsHaLImGziTeGwAIzCpQTkNouuHC9PTBke5hpjSLIGed9fdfxtipf5pjhayMCi3Y4x Omr4yHy01aK3AIpgxN2aqq2Gru03Ce/vAGr71HCq+c/PRFOyekykOkdteG3nEOVwNqoB I58c5sOe/jWGPInaXwxrFIC9qOeTZTIvaqK/Vw0mj9e/erdJ9sLwszrQYOYPERhNbZIE g9Y7TKZT1VQ5TDVB3CuUsq50FZ03tXXAWDIscNQY1dUjoJV4Rh4eDLOm4gqVEr/c6BDq waxw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:from:to:subject:message-id:reply-to :mime-version:content-transfer-encoding; bh=T2fvwW6+4A+6fSxaUICLbfRxSYRnO1tVLUNvl06GUWk=; b=PSuwwSu5C4PtdjCGdL3xRuB0wePkkocTSuUYM6+FQfzIixKpudEI+S7qZv7JIBI1cC hEXgL5k/g9P1EyhKc1B/2L9Qpn8DD5ipzThWmWTdmBdIknO49Wklenjbi6ezRMGf+GNL EVgf6KG4PQIL9uLmtIl2OlsRzoMT3SDwcVWmkUuv2yoBmkYedXdtLF1CWm0G+KK7ulvp RCUarJxie94VrXNR/mXvEdYo5FHTV04E4CU2EMy5xqJbqnLuaSabzt2Zfomk5wdz6+wW nES8HeuIAPmRZz6YIWyiSAoAlRvBets53xzuHmzK64fpUYDICVkcBnPXpZbZfaBCU6ip 3nZQ== X-Gm-Message-State: AOAM531o9Ly+cqkqq2ECQR0LGT/58LcW9jWv/3fpKfwbaluS4GD2RRNc nUqkatwMtuMVeL4RWZpEUZUwHFxeKSo= X-Google-Smtp-Source: ABdhPJwwWBGpxwvZv6Aw4rnTTMNhtA4tJfBpr5p5QjPht/vFT5y4rgKme9qhK0WfG/pGcBcoe22iKA== X-Received: by 2002:a17:907:7292:: with SMTP id dt18mr1368463ejc.649.1644403391384; Wed, 09 Feb 2022 02:43:11 -0800 (PST) Received: from ernst.home (p5b3be0d9.dip0.t-ipconnect.de. [91.59.224.217]) by smtp.gmail.com with ESMTPSA id p19sm5857701ejc.42.2022.02.09.02.43.10 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Feb 2022 02:43:10 -0800 (PST) Date: Wed, 9 Feb 2022 11:43:10 +0100 From: Gary Jennejohn To: current@freebsd.org Subject: fd7daa727126 breaks buildkernel when KERN_TLS is not defined Message-ID: <20220209114310.1a93fa85@ernst.home> Reply-To: gljennjohn@gmail.com X-Mailer: Claws Mail 3.18.0 (GTK+ 2.24.33; amd64-portbld-freebsd14.0) 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 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: 4JtxL83d24z3rK3 X-Spamd-Bar: --- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=gmail.com header.s=20210112 header.b=LeGzIC0j; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (mx1.freebsd.org: domain of gljennjohn@gmail.com designates 2a00:1450:4864:20::62c as permitted sender) smtp.mailfrom=gljennjohn@gmail.com X-Spamd-Result: default: False [-3.92 / 15.00]; HAS_REPLYTO(0.00)[gljennjohn@gmail.com]; RCVD_VIA_SMTP_AUTH(0.00)[]; FREEMAIL_FROM(0.00)[gmail.com]; R_SPF_ALLOW(-0.20)[+ip6:2a00:1450:4000::/36]; REPLYTO_ADDR_EQ_FROM(0.00)[]; TO_DN_NONE(0.00)[]; RCVD_COUNT_THREE(0.00)[3]; DKIM_TRACE(0.00)[gmail.com:+]; DMARC_POLICY_ALLOW(-0.50)[gmail.com,none]; NEURAL_HAM_SHORT(-1.00)[-1.000]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; FREEMAIL_ENVFROM(0.00)[gmail.com]; ASN(0.00)[asn:15169, ipnet:2a00:1450::/32, country:US]; DWL_DNSWL_NONE(0.00)[gmail.com:dkim]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-0.92)[-0.923]; R_DKIM_ALLOW(-0.20)[gmail.com:s=20210112]; RECEIVED_SPAMHAUS_PBL(0.00)[91.59.224.217:received]; FROM_HAS_DN(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.10)[text/plain]; PREVIOUSLY_DELIVERED(0.00)[current@freebsd.org]; FREEMAIL_REPLYTO(0.00)[gmail.com]; RCPT_COUNT_ONE(0.00)[1]; RCVD_IN_DNSWL_NONE(0.00)[2a00:1450:4864:20::62c:from]; MLMMJ_DEST(0.00)[current]; RCVD_TLS_ALL(0.00)[] X-ThisMailContainsUnwantedMimeParts: N Commit fd7daa727126 to /usr/src/sys/netinet/tcp_usrreq.c breaks buildkernel when KERN_TLS is not defined. This patch fixes it for me: --- 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 = inp->inp_socket; struct tcpcb *tp = intotcpcb(inp); int error, opt, optval; u_int ui; struct tcp_info ti; #ifdef KERN_TLS + struct socket *so = 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)) == 0, ("inp_flags == %x", inp->inp_flags)); +#ifdef KERN_TLS KASSERT(so != NULL, ("inp_socket == NULL")); +#endif switch (sopt->sopt_level) { #ifdef INET6 -- Gary Jennejohn