From nobody Mon Jul 7 16:34:37 2025 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 4bbVFV354hz60d9m; Mon, 07 Jul 2025 16:34:38 +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 4bbVFT5J5vz3JCd; Mon, 07 Jul 2025 16:34:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751906077; 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=KDdGNI9K9+BXr1BMx4g3R+kzp7CgtCr1yPKW0cpmgRY=; b=f5YcfyVONmLTnnXvH1MqtehM89Qo4tWsK2aJMR+a+e50CcWUVdHX3LM05kM45+a0cppMpt bO+KLQrqBHJAqmkFT3o2YZ32WrMNRO8YQDXUgB0aCtI5CHguPp+of2PYQiNr1Kpk+W0dCP UF2/lPeMvTS+s+Y+iNz71tddXB4txsFndaFbmPqvzou/vC65lc6gKzl6ySjaMJj04mhJai o63FotZ7OwfFcHZVmGxuwwDp2oQwmqhivuh5TY1IR1FpO1Og7fUN6naOmpray/ash6dz/9 5pmTA9sN68M5PdJgdpacMVpa8IlHzgec1M3woi95eKvfIyNwsfJmD5jTBK0dtw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751906077; 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=KDdGNI9K9+BXr1BMx4g3R+kzp7CgtCr1yPKW0cpmgRY=; b=x3F5JuihtwaAQI0HlJBeXv43S8r1EpaaWVPYxVWkI9dqslhaINuUfZ+CuyYdDN/Y0YAzih nP2NnBdXBwsHkeZCXUKWx6nb1Cw/fUZIqPQ7T0PNqkjFO/B1QGqIhxk/E06IrxYEAtFBQX OL6LiQo54DQ5Yo2EtgF/t8a7LzqLMmHNtiH2zDhu9NLuTEZQA8av1W7Ks4ZMhlwOLiQOUp BkC2diGt05OOP5DMIaHCMjyIKgPsx06sfLsg775hXnRw89U7deYfy5JnkkE6STvzHPuiVW rU+B53TiwRypi4o/V5mejJXtBbJeKPffY4Ba4zb+SO1cxdUBIt+lcPZ+6c8YPg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1751906077; a=rsa-sha256; cv=none; b=sJmghjF5PyMmsja7u3iqvYXiQuVKGJA5SoPaULY1HSRWAo2w5d7N9O2Jc29XBkBfm9lBW/ Bb2sjkrBYCdc40fd4TZcghAw82nom73QkQsfOxdbKCmA9k/gEZHJLkpsUq6Wq8ncNDTofU h7bqFsOCgGq7djQHb35ctfmLamd9y/Un7gTR/SVKCIu7DL8VPet/FHSIzyYumj43ObGXME ncFeZwfcYkrHnJMqikxcC7TGbmdIBgu/a2CUHvNyfjEeRGF3fRNEumOnYYWJ6jHB2+wFsW 4x3pK/vPlvrXayc0FPSOPnpvSoTfWrenAH5lMs7hxdPRAHh+TdYb04+0WKFZFA== 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 4bbVFT30bMzym7; Mon, 07 Jul 2025 16:34: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 567GYb5h086857; Mon, 7 Jul 2025 16:34:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 567GYbQt086854; Mon, 7 Jul 2025 16:34:37 GMT (envelope-from git) Date: Mon, 7 Jul 2025 16:34:37 GMT Message-Id: <202507071634.567GYbQt086854@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Tuexen Subject: git: 96f544bcc1cb - main - tcp: don't allow to connect a TCP/IPv6 endpoint in TIME WAIT state 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: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 96f544bcc1cb641ab096812c168ebe9136e78c15 Auto-Submitted: auto-generated The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=96f544bcc1cb641ab096812c168ebe9136e78c15 commit 96f544bcc1cb641ab096812c168ebe9136e78c15 Author: Michael Tuexen AuthorDate: 2025-07-07 16:29:35 +0000 Commit: Michael Tuexen CommitDate: 2025-07-07 16:29:35 +0000 tcp: don't allow to connect a TCP/IPv6 endpoint in TIME WAIT state This ensures the TCP/IPv4 and TCP/IPv6 behave the same. Reported by: syzbot+4de353ba85dac4dcb1ab@syzkaller.appspotmail.com Reviewed by: Peter Lei MFC after: 1 week Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D51125 --- sys/netinet/tcp_usrreq.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/netinet/tcp_usrreq.c b/sys/netinet/tcp_usrreq.c index 3ea561e63503..687b0d538666 100644 --- a/sys/netinet/tcp_usrreq.c +++ b/sys/netinet/tcp_usrreq.c @@ -1520,7 +1520,8 @@ tcp6_connect(struct tcpcb *tp, struct sockaddr_in6 *sin6, struct thread *td) INP_WLOCK_ASSERT(inp); if (__predict_false((so->so_state & - (SS_ISCONNECTING | SS_ISCONNECTED)) != 0)) + (SS_ISCONNECTING | SS_ISCONNECTED | SS_ISDISCONNECTING | + SS_ISDISCONNECTED)) != 0)) return (EISCONN); if (__predict_false((so->so_options & SO_REUSEPORT_LB) != 0)) return (EOPNOTSUPP);