From nobody Wed Oct 29 09:13:37 2025 X-Original-To: dev-commits-src-branches@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 4cxM4134qzz6DNR0; Wed, 29 Oct 2025 09:13: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cxM412P4cz3xW8; Wed, 29 Oct 2025 09:13:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761729217; 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=lw4hn2VyCsyx+LqimWkIYZjueNwW3tBHw3GhcynX+GI=; b=FtMjtTccYPl/5DV1k/5q1+e98Y8NdWuDsDWe99rHDC150QhLwQwbGy20v1JmdeINC/Y4ha jRh9gNN5Q6wz+xM43jYTmGG9kb3NtMcw9zaEILTIsGyZdIKvsuYbpflFP/9W3yHU5nRei3 vzH/ZQLdSUtlATUoR/77Y100gCuwanLkkknpRgKIXUl3TEgMZq5H+kDRkqH9HdlybhsIZY jieh1lbVb6JXikeaolSFGoNRmbUBxaktJ/ujQYW5tXE8iT4kWVb80vHrvrrKWjBRG0xfHD wZuHI1Hbwq9FnVe1K1xrhvH8gsA2+MkYSgbuZXPCqTwcXluu6wez0Mag6HHJOg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761729217; 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=lw4hn2VyCsyx+LqimWkIYZjueNwW3tBHw3GhcynX+GI=; b=S2ToTJHA0V1O+FZPFKWzCj4Kl9h1IA2NjvYQQRqrZKjQwFVH3rbfI32+e7gK6tQ3Q82fF5 ERH3z9fGh5JsI/9xs7oCyukvWHxXv3lMx2WMwkrm8wBjPq8VpMXjYhgxPNZUv2K440c91r N7X79O2axSc1dUG23EgGiBsnyaSY2FrU2RR1EAPObAXvw0P6lrlddQ8xW7e4qSggShAp7N bTpKmylmT2qTJiK9wtAwFPA+nAJoeasffEp/d8bmG2m0pUFDQMIMNnSrOkVVT8cYDB2AW3 jKDLC/+Ar/UBIxBDZW8qMWOROav3dItfRNR9/a8vV0TxCidGpqgkaHGgqCwxmw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761729217; a=rsa-sha256; cv=none; b=nlyGQ1Tixl8bAAtjEwj85BUS3Tj6ZYhQd3sWcCiuYX+wzCRVaz+fCafvaI4JF/LKy9hn+R jdOtQC6L4ZrTjscvA2il4Ob9Krscfdcuc2p02IHENWx7xBavUI/VlJ3Q97KSrHlUT7FTt7 kJLxdc4zX3AzQLwHeOmG9B6Pr6Fy+2UuQk0pPTtRem0RasFhO4yBUGOPnpLf0Xzaz5NX4f vstARDN7WPus2Zzj7swYIxEDy+6C2z/vyPlbglLIBuH3Dj8VN2EjSFo3I6REC1Sc5fmmSC Iy/OuLny4vYutpk/9QKDmaVTARdQibV0wE3swNtjDr+sFmdo2Fh3KFWD2JSc3A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cxM411cbQzTYr; Wed, 29 Oct 2025 09:13: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 59T9DbKE015406; Wed, 29 Oct 2025 09:13:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59T9DbC9015403; Wed, 29 Oct 2025 09:13:37 GMT (envelope-from git) Date: Wed, 29 Oct 2025 09:13:37 GMT Message-Id: <202510290913.59T9DbC9015403@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: 9611bf2fed71 - stable/15 - tcp: improve credential handling in syncache List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 9611bf2fed71ca62161249630f98e7eac06eff6b Auto-Submitted: auto-generated The branch stable/15 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=9611bf2fed71ca62161249630f98e7eac06eff6b commit 9611bf2fed71ca62161249630f98e7eac06eff6b Author: Michael Tuexen AuthorDate: 2025-10-27 22:28:59 +0000 Commit: Michael Tuexen CommitDate: 2025-10-29 09:09:51 +0000 tcp: improve credential handling in syncache When adding a syncache entry, take a reference count of the credentials while the inp is still locked. Thanks to markj@ for providing a hint regarding the root cause. Reported by: David Marker Reviewed by: glebius Tested by: David Marker Fixes: cbc9438f0505 ("tcp: improve ref count handling when processing SYN") Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D53380 (cherry picked from commit 44cb1e857f048d2326bdc1a032ccd2c04d2bcdc9) --- sys/netinet/tcp_syncache.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/sys/netinet/tcp_syncache.c b/sys/netinet/tcp_syncache.c index 3cb538f7054d..3a7755e9f09e 100644 --- a/sys/netinet/tcp_syncache.c +++ b/sys/netinet/tcp_syncache.c @@ -1380,6 +1380,7 @@ syncache_add(struct in_conninfo *inc, struct tcpopt *to, struct tcphdr *th, struct tcpcb *tp; struct socket *rv = NULL; struct syncache *sc = NULL; + struct ucred *cred; struct syncache_head *sch; struct mbuf *ipopts = NULL; u_int ltflags; @@ -1408,6 +1409,7 @@ syncache_add(struct in_conninfo *inc, struct tcpopt *to, struct tcphdr *th, */ KASSERT(SOLISTENING(so), ("%s: %p not listening", __func__, so)); tp = sototcpcb(so); + cred = V_tcp_syncache.see_other ? NULL : crhold(so->so_cred); #ifdef INET6 if (inc->inc_flags & INC_ISIPV6) { @@ -1636,16 +1638,16 @@ syncache_add(struct in_conninfo *inc, struct tcpopt *to, struct tcphdr *th, /* * sc_cred is only used in syncache_pcblist() to list TCP endpoints in * TCPS_SYN_RECEIVED state when V_tcp_syncache.see_other is false. - * Therefore, store the credentials and take a reference count only - * when needed: + * Therefore, store the credentials only when needed: * - sc is allocated from the zone and not using the on stack instance. * - the sysctl variable net.inet.tcp.syncache.see_other is false. * The reference count is decremented when a zone allocated sc is * freed in syncache_free(). */ - if (sc != &scs && !V_tcp_syncache.see_other) - sc->sc_cred = crhold(so->so_cred); - else + if (sc != &scs && !V_tcp_syncache.see_other) { + sc->sc_cred = cred; + cred = NULL; + } else sc->sc_cred = NULL; sc->sc_port = port; sc->sc_ipopts = ipopts; @@ -1783,6 +1785,8 @@ donenoprobe: tcp_fastopen_decrement_counter(tfo_pending); tfo_expanded: + if (cred != NULL) + crfree(cred); if (sc == NULL || sc == &scs) { #ifdef MAC mac_syncache_destroy(&maclabel);