From nobody Mon Oct 06 16:24:08 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 4cgPjN4c1xz69cZN; Mon, 06 Oct 2025 16:24:08 +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 4cgPjN3bCYz3ndt; Mon, 06 Oct 2025 16:24:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759767848; 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=umIEHPlYyK33oF/ux0Iu5y3gRRwGfQd2yorEZyK/gvQ=; b=nO0izGMOJPn8la8EPwsZg9SvIBe18YQG079YL4sY6QakkVTKfy1WM5RTSjCAfOFKP4jkAR T8RaQECiVsbeC0NWatgpIDC7YtQSnCKh9Lc1vqN1Vb4dgliYgXO2laZKLzdixvu8+LMCGN Xz5gq+q18UyrkOnV5pwPvkKSwMbRmF+cPuaTV3EYMCwGLqu1eNZyV4j90Z9k6aJqynq3z/ LX8jIvyIs98mglu6jM1bpwPliUquuFUWpfIw46r0cVRijVatYXBc3qj9udY5TY0+SVT/ya z7StP/0VeIfhiCWEpyVFbtwcwmDOBYB16/t642lgBPYFZIwOH+VDaRg3mZwlDw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759767848; 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=umIEHPlYyK33oF/ux0Iu5y3gRRwGfQd2yorEZyK/gvQ=; b=l5SI+z60+fJegWuF9euzA3mz/Rle9vVrNtL2MEc7IZ9Xt/cuTNlq0zWpk2DA3Lyiv9QJFw gltxhspi0rpxyiCpUNbcgOjJ+qsDKV6nJBmnNaW40WkFwanZMCGg4PmMRfnWc4XUGn+ReH jMvmwAZ9CcCVfK2uWGV41VWBRCx/X25PjlpyHhiSJvbRFRhr+qichyOtLm5JpovLsNJQVp 9MqOYJQJ9dNArrX3+cn0BnJLCuHbeTr0T5/v8zsYZ5pbnN7F+UOoXAIxQ0ml9tcK8VWxXZ 4PeLHYOmgUDsL1EFm31oieuQTPNL9qwu/YbNa1+OmiC5SrdI3GMNJQrooALoFQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1759767848; a=rsa-sha256; cv=none; b=QZr0yFYjY4LmQz/FsZJ728WSHuIzFj3YKL7SFrNQeP5gN9toRIgEzpVu8TQNDKlceZcurx t/+X2bDMX0C16AFLDImadOQYBQJIvXcmq6Er4GDoqS2i4eSRDzA+Mn/LGThfxy5RYL6cLr 7m7hFALUI0MjzgjxPL99t44EcKSsYsHleDftklbGx0PdLNKpnZd+Mx8O433FuYFBUdgZ+Q g+FwHxxau+UjM2tgcg4zC6hBhbFBcd7NE2SAoTrYpl4eg1qq8Ql1HD0z5z7y8VcEGieaxJ Uu+qRG3pRRqxlDcnyQQ8fM4Hgdt/V9s/aEqmqffQNteP1hQp6ASmyzNTmXjXCw== 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 4cgPjN37qTz15r9; Mon, 06 Oct 2025 16:24:08 +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 596GO8DH058086; Mon, 6 Oct 2025 16:24:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 596GO8F7058083; Mon, 6 Oct 2025 16:24:08 GMT (envelope-from git) Date: Mon, 6 Oct 2025 16:24:08 GMT Message-Id: <202510061624.596GO8F7058083@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Jonathan T. Looney" Subject: git: 1cc96642675b - stable/14 - tcp: close two minor races with debug messages 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: jtl X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 1cc96642675bf5029ce72dcf981d4a1cf993dee3 Auto-Submitted: auto-generated The branch stable/14 has been updated by jtl: URL: https://cgit.FreeBSD.org/src/commit/?id=1cc96642675bf5029ce72dcf981d4a1cf993dee3 commit 1cc96642675bf5029ce72dcf981d4a1cf993dee3 Author: Jonathan T. Looney AuthorDate: 2025-10-02 17:26:03 +0000 Commit: Jonathan T. Looney CommitDate: 2025-10-06 16:23:10 +0000 tcp: close two minor races with debug messages The syncache entry is locked by the hash bucket lock. After running SCH_UNLOCK(), we have no guarantee that the syncache entry still exists. Resolve the race by moving SCH_UNLOCK() after the log() call which reads variables from the syncache entry. Reviewed by: rrs, tuexen, Nick Banks Sponsored by: Netflix MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D52868 (cherry picked from commit ad38f6a0b466bf05a0d40ce1daa8c7bce0936271) --- sys/netinet/tcp_syncache.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/netinet/tcp_syncache.c b/sys/netinet/tcp_syncache.c index ee3b9b4994c9..57be70d64312 100644 --- a/sys/netinet/tcp_syncache.c +++ b/sys/netinet/tcp_syncache.c @@ -1208,7 +1208,6 @@ syncache_expand(struct in_conninfo *inc, struct tcpopt *to, struct tcphdr *th, */ if (sc->sc_flags & SCF_TIMESTAMP && to->to_flags & TOF_TS && TSTMP_LT(to->to_tsval, sc->sc_tsreflect)) { - SCH_UNLOCK(sch); if ((s = tcp_log_addrs(inc, th, NULL, NULL))) { log(LOG_DEBUG, "%s; %s: SEG.TSval %u < TS.Recent %u, " @@ -1216,6 +1215,7 @@ syncache_expand(struct in_conninfo *inc, struct tcpopt *to, struct tcphdr *th, to->to_tsval, sc->sc_tsreflect); free(s, M_TCPLOG); } + SCH_UNLOCK(sch); return (-1); /* Do not send RST */ } @@ -1287,11 +1287,11 @@ syncache_expand(struct in_conninfo *inc, struct tcpopt *to, struct tcphdr *th, * SEG.ACK must match our initial send sequence number + 1. */ if (th->th_ack != sc->sc_iss + 1) { - SCH_UNLOCK(sch); if ((s = tcp_log_addrs(inc, th, NULL, NULL))) log(LOG_DEBUG, "%s; %s: ACK %u != ISS+1 %u, " "segment rejected\n", s, __func__, th->th_ack, sc->sc_iss + 1); + SCH_UNLOCK(sch); goto failed; }