From nobody Fri Jan 31 22:24:39 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 4Yl9Rq3Pjyz5lZHC; Fri, 31 Jan 2025 22:24:39 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Yl9Rq2fPfz3lHb; Fri, 31 Jan 2025 22:24:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738362279; 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=34Kdjn+2vmTp8XaT+mcyX1YsFuF9W8r80K7dWeNcUf4=; b=Itm/9muV1XtQ1FU6DMNb9L1TiduYp6M/xpI9oaEOnws0FZWQYtJWwWz/G3RK+SWmaxiJhu 4aKK0qr0riDI8WM4Qd7eOQMeaJYem/yNBeODmOu2Zkd1XPaPr1AH6qAv9mJZZd/yDZwQjg h2IciQOaMFRNjOgWxoMcPnyjg59JVdVR1+2aL3HppO0EY4hUQc+Dwsw7Zqk8thyiEHL5UB FCfih3WY+NY6EtiwWekpLspR8Rkd4/ERFV+LmFy8Y4V1pv/BddfJGPMRD8/yyX5piDMgVy JY0k8mjS0jJ+l8eR6R7q/4KvT9nmGi589ilVyNKON/bnUIvegsSKg6Tg7t6Jtw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738362279; 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=34Kdjn+2vmTp8XaT+mcyX1YsFuF9W8r80K7dWeNcUf4=; b=UI6kUnTniFKK5/9cv5nt5cdZUPdXmcrSgHDh3o47I1mNAuraJLkRD6UJ1wsLI6AGmFib1D TEne+EsnH06HLPFGr2xbwcFuPzCQMcU39dZ5zonbaRTKcIlOiWDPEnBvmem13A1YkngK0b IceUd15UaS/oTL52ytyQO0sxRkl+7yoovgVC2bo016cUAP8WzsVH9qZ4WAxy0mwhQI0sFj x1CPX1/OW6EPOBwHqpw8EkRZEzwhoXnkCnU2xGkUjUPd0NHOkDOcwpJVpu5YAChKZF8VUf TtCG4kiWrSY71fAIjW9/+rHJQ8jy4QFA5a61HOStFH6UKLQJ3VKek7R7msB31g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738362279; a=rsa-sha256; cv=none; b=vtMNBizJFTip8w0jSpxNQVfb0+uOuKRkLGnH246/awenS88RisD7fCEk0E8DOKfGaP83UE 0DK8Eo74MuV7hXTP5VuQTNz8uxNYvI9ClqLk5gK+q7FrETO/A6Eb/C0aEVHIusFTKAGHTB 9eDzMnlnkr7u4U6hag46ln+bdRXOLAQGTssZ+sVP/J5hAm2o4B4PVr26kir95ypNhnwSB/ WbXEjMMihxYUuk2qBkbCHU1SwyP4wnurF7ng3khZA9KiQgmM5v/y8Nmock0/QAefCQm9CD +OsEVx4aGSn5ieQcqOHDdwL97SehvVw1Kv8TiXH5abc1bFSi7cSuTGihpkg3KA== 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 4Yl9Rq27dHzdbP; Fri, 31 Jan 2025 22:24:39 +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 50VMOdqm049402; Fri, 31 Jan 2025 22:24:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50VMOdQP049399; Fri, 31 Jan 2025 22:24:39 GMT (envelope-from git) Date: Fri, 31 Jan 2025 22:24:39 GMT Message-Id: <202501312224.50VMOdQP049399@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: 2d99af941040 - main - tcp: remove check for condition that never happens 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: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2d99af941040548234c7945cc6d62c416bd9133c Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=2d99af941040548234c7945cc6d62c416bd9133c commit 2d99af941040548234c7945cc6d62c416bd9133c Author: Gleb Smirnoff AuthorDate: 2025-01-31 22:24:24 +0000 Commit: Gleb Smirnoff CommitDate: 2025-01-31 22:24:24 +0000 tcp: remove check for condition that never happens A tcpcb in TCPS_LISTEN has always socket in SO_ACCEPTCONN. One block above there is an assertion that proves that this never happens. We stopped ever clearing SO_ACCEPTCONN back in 779f106aa169. This reverts commit 982c1675ff8864f51007e0be402ead88429222bb. Reviewed by: cc, markj Differential Revision: https://reviews.freebsd.org/D48710 --- sys/netinet/tcp_input.c | 9 --------- 1 file changed, 9 deletions(-) diff --git a/sys/netinet/tcp_input.c b/sys/netinet/tcp_input.c index 03d493b1d7a9..647bcd17f7bc 100644 --- a/sys/netinet/tcp_input.c +++ b/sys/netinet/tcp_input.c @@ -1354,15 +1354,6 @@ tfo_socket_result: * Only the listen socket is unlocked by syncache_add(). */ return (IPPROTO_DONE); - } else if (tp->t_state == TCPS_LISTEN) { - /* - * When a listen socket is torn down the SO_ACCEPTCONN - * flag is removed first while connections are drained - * from the accept queue in a unlock/lock cycle of the - * ACCEPT_LOCK, opening a race condition allowing a SYN - * attempt go through unhandled. - */ - goto dropunlock; } #if defined(IPSEC_SUPPORT) || defined(TCP_SIGNATURE) if (tp->t_flags & TF_SIGNATURE) {