From nobody Tue Sep 9 18:07:37 2025 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 4cLsHF3ZlWz67FHv; Tue, 09 Sep 2025 18:07: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 4cLsHF2drbz3gZc; Tue, 09 Sep 2025 18:07:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757441257; 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=780mRLcRGKszZ8rpiQFbuibVl4gAo76DMM94QNoiXv0=; b=r4ai/78G+mfg6JeZCidBR8zzATJDuWEJf2pfo8yTyA+B94646plGSLjuC31z0ZazW3Bkc/ 0qruUrwvL2DaTWzpqGREuncLcfAsYo5dzwrNcAELMaOiX3qqTwxU3BMZttJpHNY1hVCcPd yxaxtP8zxlA9a9NZHiZRaYG4hAfrxGN/bAjmTr4LjQAWM10fiZhOfWB9l+wJC1Vlh+ufa4 ZliDxgb14u3nV3A3QnHEplerOQuqEa2JzS0AXQnJxYlVQdgWtJWJ/6SLfYxYdsVi9i+kmm 3FRQFPG5kKdVAq6p3K5GNek0i321KTNrp4bsszUTTpLhygqJwuz5waM1dhFtVw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757441257; 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=780mRLcRGKszZ8rpiQFbuibVl4gAo76DMM94QNoiXv0=; b=oZZLaLZ3BliMPkYJwMno26X48XuYZL3VV2YhxSduZzl8Bf52RbmBjqaRwHwIcGS8HkZDSh WI7yL2WZt4qTSG6D6qk+MhaZV/FOjIEx0wCk1PMIZhzM8R3d8q3k+7zbzsFmlVx+9YSFfu smxI5PpPG/n0WOWCS0Sc7oIx8aPEvjXww6+4PUCYyrwG+7NkCgnaIat8VOwAZB79wGxvO+ gnnAuoNKtu1nMzB+Qb3yzZCa7mzEBp6f4FDbqrS+1RF+SKtjWximExmsUxp9RbafIShr5s 1+TOb6+XKKwj4kuCB3vIAH0iUKDEHbeNyBDhjiZeyYPu1Dgq8IMoQEZIFhw7bw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1757441257; a=rsa-sha256; cv=none; b=oC0wS4es22VhyoPSTWPz6fAQLZ/TE4BAxtk7DTcgrZ8ml0hsdHhyQu5NSUpUbcUYaIcT1z FwgHIfMFymzx1kvSVDiSkV7MDLQNdM3AJX0Iw0cO5sGpNzDx0C6Q389c4PdcoVHUhA8UBO Upkc8/6GI9jDrKOCMcn7jnK4CsM4NJk5M9qKuiVr59PmsdbsbRrbKu4H2ddhRwpa8OvCpm vu8CnBdTvB35+RmuNH+GXAojxfasIGw9n+uX+ymlULW3qvY0RbS9jYDRmQ7fEjZFW1/USq Y4jGzOLPqNqiJOWRRb4LZDU72ShGWB9I0kDMOubviiRV4i8CIIoBTYiWRde+FA== 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 4cLsHF2Bwnzn7X; Tue, 09 Sep 2025 18:07: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 589I7bGv085892; Tue, 9 Sep 2025 18:07:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 589I7bRe085889; Tue, 9 Sep 2025 18:07:37 GMT (envelope-from git) Date: Tue, 9 Sep 2025 18:07:37 GMT Message-Id: <202509091807.589I7bRe085889@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: 1b72d275eef4 - stable/14 - tcp: unlock before syncookie_expand() 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/14 X-Git-Reftype: branch X-Git-Commit: 1b72d275eef4b3219708bbe9ef5a898c967195dd Auto-Submitted: auto-generated The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=1b72d275eef4b3219708bbe9ef5a898c967195dd commit 1b72d275eef4b3219708bbe9ef5a898c967195dd Author: Gleb Smirnoff AuthorDate: 2025-06-17 15:50:23 +0000 Commit: Michael Tuexen CommitDate: 2025-09-09 18:07:18 +0000 tcp: unlock before syncookie_expand() The function doesn't need a lock on sch. It uses the pointer as value for the SipHash calculation. Reviewed by: tuexen Differential Revision: https://reviews.freebsd.org/D50898 (cherry picked from commit 0809d26de24defdc4a2ae161357566c02dc163d1) --- sys/netinet/tcp_syncache.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/sys/netinet/tcp_syncache.c b/sys/netinet/tcp_syncache.c index b50d6e9ea84e..4adb92fff36c 100644 --- a/sys/netinet/tcp_syncache.c +++ b/sys/netinet/tcp_syncache.c @@ -1122,14 +1122,13 @@ syncache_expand(struct in_conninfo *inc, struct tcpopt *to, struct tcphdr *th, s, __func__); goto failed; } + if (locked) + SCH_UNLOCK(sch); bzero(&scs, sizeof(scs)); if (syncookie_expand(inc, sch, &scs, th, to, *lsop, port)) { sc = &scs; TCPSTAT_INC(tcps_sc_recvcookie); - } - if (locked) - SCH_UNLOCK(sch); - if (sc == NULL) { + } else { if ((s = tcp_log_addrs(inc, th, NULL, NULL))) log(LOG_DEBUG, "%s; %s: Segment failed " "SYNCOOKIE authentication, segment rejected "