From nobody Thu Dec 05 16:45:36 2024 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 4Y40cx1Vkcz5dmSF; Thu, 05 Dec 2024 16:45: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y40cx0wqGz46Kq; Thu, 5 Dec 2024 16:45:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733417137; 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=X0KvCkbmINxTNKmIi0KXx/r1osXKga8xPw5BFLi+nWo=; b=HFXjA62WRa1AOl88ii/vhIWlVOluv04ji63hWps8x3C5Di9OIReoVeBhQMWSzvicd2Ifsr Xh9xSUd48fa9Yl1SNH5lkNgPYwxiH0+Fu6t+LJ69KB+pnUJE6LlS0luEnTfN0papkHoAh0 Pvkr/p6j5E2ApFwHKhtHu9F1GRcR4nGrF8OF2FKWLG4Z5+Zim7KrcoSg2uUsbcl7dKyhaJ Dw6wPCZ3/5yp3bkIZTcUe6gBgxQRODKqGie+jvHoWtgWGXN8GCv4fNUlu3/5HJZH/ECjA1 Ekm6nqwdMhX0hENso7GP1lIfYTRmz4BWUrtfmlZ3xXEXkJC1/367qCXBTrzynw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733417137; 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=X0KvCkbmINxTNKmIi0KXx/r1osXKga8xPw5BFLi+nWo=; b=hTKWtM33RS+9ehB3Y9h2Yolc/rxbpkUUgr/6pBFU2a/RcQ9v7CInbA86EcADfpmEbn7RH/ AzN66pzKW1p4YAnChaPourho++CYr91aJjBaFz4VpiCFXI+Wtc3CNYt6p01Zthom6tyz/y FFnSWL5BDQmmqIeuMabkTIlCgbemVdxgE3JBsXl/v167ti/yS6fQH4vs8nchby1dvN9np3 HnDK88Wt4bR+HGBkLJFTI02f4z4yMq9I9SsbsL3pjwLcqGl8mPQ+jgqS6TiTKwGcoMC5ck OqM9/75IfK1UvAJWWvVs0ybN74DTuR9uIa5QzCNuiXedZDEykWkvdWTZBRCkDw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733417137; a=rsa-sha256; cv=none; b=aJxEk4q4AxdFLKS35orO0mfqwwNGFlY2/jnfr3gXeyZF4WehZluwLxj7el848NhaEq7ABZ nieQObXvTNHhDxrnDrFwsb5IL8FLH+4yqLDLtw9OZeMqEQZRDCsgWmoXyLSEi2U4aQd/V/ THGqy/8oKQARVhMadRiIEVq0HY9nSDEcw1AxhiyLrDuIh4RLnwESfEB1zKMagyod0NPEw7 TV/xxSRdiPfptg80KumEQeDeF9IALB78uCh9PbcgonXW6zsQJVSKiWSUuLhpqbyR5cEICa QN6Y6d48fTvSuSvAsYbzKnrxifXajMjwfWlBhj2Yb4J9k3BCMnccrtqK5QJj2w== 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 4Y40cx0WtRz1156; Thu, 5 Dec 2024 16:45:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4B5Gja5q053451; Thu, 5 Dec 2024 16:45:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4B5Gjabg053448; Thu, 5 Dec 2024 16:45:36 GMT (envelope-from git) Date: Thu, 5 Dec 2024 16:45:36 GMT Message-Id: <202412051645.4B5Gjabg053448@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: ffb3d384fc1d - main - inpcb: Fix the GENERIC-NODEBUG build 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ffb3d384fc1d550a764def2c0cd034ac3a4f0b86 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=ffb3d384fc1d550a764def2c0cd034ac3a4f0b86 commit ffb3d384fc1d550a764def2c0cd034ac3a4f0b86 Author: Mark Johnston AuthorDate: 2024-12-05 16:38:22 +0000 Commit: Mark Johnston CommitDate: 2024-12-05 16:45:26 +0000 inpcb: Fix the GENERIC-NODEBUG build Fixes: 01f8ce83242d ("inpcb: Factor out parts of in6_pcbbind() and in_pcbbind_setup()") --- sys/netinet/in_pcb.c | 3 +-- sys/netinet6/in6_pcb.c | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/sys/netinet/in_pcb.c b/sys/netinet/in_pcb.c index 94fb406bcd2b..1309d19121cd 100644 --- a/sys/netinet/in_pcb.c +++ b/sys/netinet/in_pcb.c @@ -962,7 +962,6 @@ in_pcbbind_setup(struct inpcb *inp, struct sockaddr_in *sin, in_addr_t *laddrp, u_short *lportp, struct ucred *cred) { struct socket *so = inp->inp_socket; - struct inpcbinfo *pcbinfo = inp->inp_pcbinfo; struct in_addr laddr; u_short lport = 0; int lookupflags, sooptions; @@ -972,7 +971,7 @@ in_pcbbind_setup(struct inpcb *inp, struct sockaddr_in *sin, in_addr_t *laddrp, * No state changes, so read locks are sufficient here. */ INP_LOCK_ASSERT(inp); - INP_HASH_LOCK_ASSERT(pcbinfo); + INP_HASH_LOCK_ASSERT(inp->inp_pcbinfo); laddr.s_addr = *laddrp; if (sin != NULL && laddr.s_addr != INADDR_ANY) diff --git a/sys/netinet6/in6_pcb.c b/sys/netinet6/in6_pcb.c index 6b5a9d3706be..4f7c0912e675 100644 --- a/sys/netinet6/in6_pcb.c +++ b/sys/netinet6/in6_pcb.c @@ -298,12 +298,11 @@ int in6_pcbbind(struct inpcb *inp, struct sockaddr_in6 *sin6, struct ucred *cred) { struct socket *so = inp->inp_socket; - struct inpcbinfo *pcbinfo = inp->inp_pcbinfo; u_short lport = 0; int error, lookupflags, sooptions; INP_WLOCK_ASSERT(inp); - INP_HASH_WLOCK_ASSERT(pcbinfo); + INP_HASH_WLOCK_ASSERT(inp->inp_pcbinfo); if (inp->inp_lport || !IN6_IS_ADDR_UNSPECIFIED(&inp->in6p_laddr)) return (EINVAL);