From nobody Fri Feb 3 19:34:20 2023 X-Original-To: dev-commits-src-all@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 4P7m7J6crTz3kg78; Fri, 3 Feb 2023 19:34:20 +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 4P7m7J60btz3C1w; Fri, 3 Feb 2023 19:34:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675452860; 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=YwvTLvYSKTfniaV6D85QIn4q7PXpUbg5kMKg3ykL5yQ=; b=eRpfXxBo6XTq9r8Mz7FtyezVM3aqEh6as+1YvDoNQNZPqw0xPc0QEcQaIM3/2QHtd709mO Yz21VZuGAEM/EjyO2UvWCtOvGXiJzemcd0oFz1UpPvr45hS6I4VPb20ood7YVAToF6uuWw 4LnrdNsizCmS+J5tVOUyjt/bNLQ/p9gVD3Juvxtk/5jvn4jrlUXbLnbOIrXJ8MGWG2fswX NSOyOnCdqE7FlM0NqspZM8mmiLSpXurXu4Dz+p8G1FgekimxRvdZYU7wGkX5cQP1p3MzC9 JGQRzik0fgOfuewGcf2jVk0DA2jOhsnoSSj0sdLS2xNi58uDL7Nm7u/bzJG7vA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675452860; 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=YwvTLvYSKTfniaV6D85QIn4q7PXpUbg5kMKg3ykL5yQ=; b=uv7R7kasZC0YMfDwTjtQcUqmQbxNIz5g0ikQ/UfdehNJwGponcJer6nHzr3Q4DXD4Kw5Y6 VUj9sRGWE9ykbaykkkYkqpYB7QPBFglKagHVNgWbHerojnHlx7KgiOBjWdgqPWZT3nlQnX KS8Q/CKT6o4u8JtihURy1U6ymtZv4puDUoHW80UvYU88pPexsRDSxpr9EY4zrUOKGj850O w7sE/fxqPFal9tY7M2kt4+1tq3IsMQ6DszHF7l5iNUnZV9yPpAyl74T71oQruzjeAr+iDG qhRtgCp8GdlrQbfZpOKYjSeviljAEs+a9tR6oatEAn10s8aA4uGO97ql2FxH5Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675452860; a=rsa-sha256; cv=none; b=enSsVnkMY1K0ospIjCeLGIbcAGRWDlFMyF9S0xmNX7ZWT4iURLJsja8LpgpHJ5fQ/WmEy2 6XnIBmL9lE9VSRmaEJ0BOOP1C7/bF/Kjb2398hJ5wdJ4zzo09ULryhj3tzbVmee6VapG2J 0MWBDdXGYjS09BY3p5oxC94fb5Qayv7GYK8yFSJTvhfz24hOVigK79rL7r0dgYtYCh8oUf /rHIzRp2LK0ODqvD7GDkONAL3/R+vzBUkqLMyvpPLQBSA4euT3hjuohrgV5aX9mjZ2oO9Q 2HDkcY3Do46HGc1DJHDEPvm8aelIOvMQtpQgl1dCWoXGMtl9Nsk6qOwaYU2XFA== 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 4P7m7J4tFmzn1Y; Fri, 3 Feb 2023 19:34:20 +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 313JYKVF041413; Fri, 3 Feb 2023 19:34:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 313JYKn3041412; Fri, 3 Feb 2023 19:34:20 GMT (envelope-from git) Date: Fri, 3 Feb 2023 19:34:20 GMT Message-Id: <202302031934.313JYKn3041412@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: 3d76be28ec60 - main - netinet6: require network epoch for in6_pcbconnect() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: 3d76be28ec6036273f8b5665e51f74b5c332e7eb Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=3d76be28ec6036273f8b5665e51f74b5c332e7eb commit 3d76be28ec6036273f8b5665e51f74b5c332e7eb Author: Gleb Smirnoff AuthorDate: 2023-02-03 19:33:36 +0000 Commit: Gleb Smirnoff CommitDate: 2023-02-03 19:33:36 +0000 netinet6: require network epoch for in6_pcbconnect() This removes recursive epoch entry in the syncache case. Fixes unprotected access to V_in6_ifaddrhead in in6_pcbladdr(), as well as access to prison IP address lists. It also matches what IPv4 in_pcbconnect() does. Reviewed by: markj Differential revision: https://reviews.freebsd.org/D38355 --- sys/netinet/tcp_usrreq.c | 3 +++ sys/netinet6/in6_pcb.c | 10 ++++------ sys/netinet6/udp6_usrreq.c | 4 ++-- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/sys/netinet/tcp_usrreq.c b/sys/netinet/tcp_usrreq.c index 5d82e5138538..df71b1c88faa 100644 --- a/sys/netinet/tcp_usrreq.c +++ b/sys/netinet/tcp_usrreq.c @@ -1471,13 +1471,16 @@ static int tcp6_connect(struct tcpcb *tp, struct sockaddr *nam, struct thread *td) { struct inpcb *inp = tptoinpcb(tp); + struct epoch_tracker et; int error; INP_WLOCK_ASSERT(inp); + NET_EPOCH_ENTER(et); INP_HASH_WLOCK(&V_tcbinfo); error = in6_pcbconnect(inp, nam, td->td_ucred, true); INP_HASH_WUNLOCK(&V_tcbinfo); + NET_EPOCH_EXIT(et); if (error != 0) return (error); diff --git a/sys/netinet6/in6_pcb.c b/sys/netinet6/in6_pcb.c index aed0f26f89ba..a76997d75ff3 100644 --- a/sys/netinet6/in6_pcb.c +++ b/sys/netinet6/in6_pcb.c @@ -357,8 +357,8 @@ in6_pcbladdr(struct inpcb *inp, struct sockaddr_in6 *sin6, int error = 0; int scope_ambiguous = 0; struct in6_addr in6a; - struct epoch_tracker et; + NET_EPOCH_ASSERT(); INP_WLOCK_ASSERT(inp); INP_HASH_WLOCK_ASSERT(inp->inp_pcbinfo); /* XXXRW: why? */ @@ -381,10 +381,8 @@ in6_pcbladdr(struct inpcb *inp, struct sockaddr_in6 *sin6, if ((error = prison_remote_ip6(inp->inp_cred, &sin6->sin6_addr)) != 0) return (error); - NET_EPOCH_ENTER(et); error = in6_selectsrc_socket(sin6, inp->in6p_outputopts, inp, inp->inp_cred, scope_ambiguous, &in6a, NULL); - NET_EPOCH_EXIT(et); if (error) return (error); @@ -422,6 +420,9 @@ in6_pcbconnect(struct inpcb *inp, struct sockaddr *nam, struct ucred *cred, struct sockaddr_in6 laddr6; int error; + NET_EPOCH_ASSERT(); + INP_WLOCK_ASSERT(inp); + INP_HASH_WLOCK_ASSERT(pcbinfo); KASSERT(sin6->sin6_family == AF_INET6, ("%s: invalid address family for %p", __func__, sin6)); KASSERT(sin6->sin6_len == sizeof(*sin6), @@ -430,9 +431,6 @@ in6_pcbconnect(struct inpcb *inp, struct sockaddr *nam, struct ucred *cred, bzero(&laddr6, sizeof(laddr6)); laddr6.sin6_family = AF_INET6; - INP_WLOCK_ASSERT(inp); - INP_HASH_WLOCK_ASSERT(pcbinfo); - #ifdef ROUTE_MPATH if (CALC_FLOWID_OUTBOUND) { uint32_t hash_type, hash_val; diff --git a/sys/netinet6/udp6_usrreq.c b/sys/netinet6/udp6_usrreq.c index 1ab838d60ac0..7ce4c9974228 100644 --- a/sys/netinet6/udp6_usrreq.c +++ b/sys/netinet6/udp6_usrreq.c @@ -1101,9 +1101,7 @@ udp6_close(struct socket *so) static int udp6_connect(struct socket *so, struct sockaddr *nam, struct thread *td) { -#ifdef INET struct epoch_tracker et; -#endif struct inpcb *inp; struct inpcbinfo *pcbinfo; struct sockaddr_in6 *sin6; @@ -1181,9 +1179,11 @@ udp6_connect(struct socket *so, struct sockaddr *nam, struct thread *td) vflagsav = inp->inp_vflag; inp->inp_vflag &= ~INP_IPV4; inp->inp_vflag |= INP_IPV6; + NET_EPOCH_ENTER(et); INP_HASH_WLOCK(pcbinfo); error = in6_pcbconnect(inp, nam, td->td_ucred, true); INP_HASH_WUNLOCK(pcbinfo); + NET_EPOCH_EXIT(et); /* * If connect succeeds, mark socket as connected. If * connect fails and socket is unbound, reset inp_vflag