From nobody Wed Dec 7 20:29:37 2022 X-Original-To: dev-commits-src-main@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 4NS85s74KTz4jlrc; Wed, 7 Dec 2022 20:29:37 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4NS85s6Sgyz3h7L; Wed, 7 Dec 2022 20:29:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1670444977; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Iey0rDvClbZkVry0ZqupXaOIfJkW2yJCDylKkQAvRbM=; b=egcCivDVVHEQ/ZXtjFbVo2/ZJY85guB0HRrttvCtbB7tPgHNv4bgKZZYUqJaH4n/97gxRf DkEUFQHvdAkhAjRpaq+1frlzxv0RTvPeWjSzHtcFLzfJ5FVd2NmWQBA//zd2iBOnGCYDoy l6N8KRpf69/p35gUX4X0vCmhmfnSXZYnMJhiHddev1v1sBTCgembeVMdFfoUvmiowUKtI3 mfkfnmyMlxVV4rJP+Ay8A5WmJx/4l04njidnntwdQR+F7EKHlPHwxnD0M0ppwY35vuq1HL T3NeUMy8zfpCajbYBjd5XBUbHw7ofW3Sg1Tf5UbGT1iPzPeTcNOcagGSEJmw7w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1670444977; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Iey0rDvClbZkVry0ZqupXaOIfJkW2yJCDylKkQAvRbM=; b=xD7m4oUiFDkJpA/6zpgC7SQOIJGKjtv26/pANHeApsoKK+ZYGJdaO6v4QIbDKaJAoP+GHZ JvsTbt4ffv667JZ7ZdOHuxIgNFni4mGiQiwp1yt/95/9/aJGlnuL4aaIB6pmr0jktkve1K xH+3Wi/utXhlu2cWXfSutJ0NPdxpXvbuNwKhVxQYETdw2QAv5t7V0CdSBH7G8jRU9toOpa DoKnn+P0HEgguJ7cxvpYwH7D8hA2q/YreJmjU62gg0tksY8DK2pMSDLBa3R8LnbVJwg5ef 4YEFBWYkPMvSw3fGSmrszp+5WOO32yrX5AZnpRecQWEoXj0LTjAEcwC9Vv7exg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1670444977; a=rsa-sha256; cv=none; b=RWfkZg436PUnQA31A0GkG666ISDvpQGoaj9f3nwfD56MZWpvBF6C6wAbwGPlOgpS7cMiYX RupnfwnRV+V8Va+ddtEPrO0Hn66jTqe9XVOPGUR1HF9DXhsE3Bog6gqnhdaTARC8fW60pb 5NCKWsy9kkRRittb5KFnfOeI5HqTbGCRD9lz3/LItbN7qWxUZAOutjrHZAY7sf2Nhnyqb0 DY8qbqUkNqzVryZQzUmJWVDmS2jnbZ0UCzD+o0bDzlEoZupIBdAUKreO3+3CjRwUQPKHCT Dd/6aNzpX6ukr+ktMbjI8+9Z0h6uNG4zTLNHMR2uF9h+Xf+IFuSUp/GYp+cdbg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4NS85s5XcyzTSY; Wed, 7 Dec 2022 20:29:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2B7KTbqG075037; Wed, 7 Dec 2022 20:29:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2B7KTbwY075036; Wed, 7 Dec 2022 20:29:37 GMT (envelope-from git) Date: Wed, 7 Dec 2022 20:29:37 GMT Message-Id: <202212072029.2B7KTbwY075036@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: 3f89900bf1a4 - main - udp6: fix build with INET6 and without INVARIANTS List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3f89900bf1a40ce033e7b1b3f9ba5830669a2360 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=3f89900bf1a40ce033e7b1b3f9ba5830669a2360 commit 3f89900bf1a40ce033e7b1b3f9ba5830669a2360 Author: Gleb Smirnoff AuthorDate: 2022-12-07 20:27:15 +0000 Commit: Gleb Smirnoff CommitDate: 2022-12-07 20:27:15 +0000 udp6: fix build with INET6 and without INVARIANTS Reported by: Michael Butler Fixes: 483fe96511ec02a3f077f9a59f1a96acb3640dea --- sys/netinet6/udp6_usrreq.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/sys/netinet6/udp6_usrreq.c b/sys/netinet6/udp6_usrreq.c index 484f43d24808..df5e56076218 100644 --- a/sys/netinet6/udp6_usrreq.c +++ b/sys/netinet6/udp6_usrreq.c @@ -1202,14 +1202,11 @@ static void udp6_detach(struct socket *so) { struct inpcb *inp; - struct udpcb *up; inp = sotoinpcb(so); KASSERT(inp != NULL, ("udp6_detach: inp == NULL")); INP_WLOCK(inp); - up = intoudpcb(inp); - KASSERT(up != NULL, ("%s: up == NULL", __func__)); in_pcbdetach(inp); in_pcbfree(inp); }