From nobody Wed Dec 14 03:32:02 2022 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 4NX1BV3bDPz4kdCD; Wed, 14 Dec 2022 03:32:02 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4NX1BV2fYcz4MHH; Wed, 14 Dec 2022 03:32:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1670988722; 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=EbuVXbdhFaYHd5Lczygi0Ep2sKyVhcVCA8B5nL41qkw=; b=hD4SwzBx9x9Dr9oSwfIhdowBJhVV7tMkFsDjRprPvV/7nsmEdOdmuext7yaA2Jz/rcTn8j r/GCj8Z7yGNiyHCh9m3cpyZKMJ/2XKB4sVXIEM6tHYP2UILfENp5nvKWr7gG8YzHCDJftq DcJ9mKSrJmiPAEfNWCvQRNgJ/ABuWRzWkKJbRR+WvARG7fo9OtiKOzKRLc5EOOhtH7lZzJ ef8lGPcGpFpc+h9ljqSQ5xCpryZcyyzga2j8tg92nN0cpsHJfz+67UG8eriFYEqvHW9kC/ wRbImglYpODsqT+HfZEXJsgryw6fEe0lUVn6f/t4yYvVmby1UmYgD/r5eVKg9g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1670988722; 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=EbuVXbdhFaYHd5Lczygi0Ep2sKyVhcVCA8B5nL41qkw=; b=p3YckZ5fOQbbIlt95zb5yRsAOw+agGNsUiL0r2sxfj04ufh9gTi0pcJU19XSqu3U9kqjWY 85wmENmQb/4fOcWrXsdxFhZ2LOQKWgZD5QILDodnOITtMs2LzI6qsuJpFag2a0t8qnH51X eVe9705NTjq39OuoL8n8wbQ2f5kw8kSVRjxoUxVRg4uZXWWW59OQVf5jkDtQdtFtusWJ6d Vxb+sLh3GNjO2S4FVumWT5WQDdukSynNWiVmh4JeqfdkBqfL8DFhcGS+rlv/BUbXrwOZ1v eDZYMz428Hkl4UqEs205tcJCpiYJukp9Mz1pvATp4Us2dUYvPVM6urHcd53+Ew== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1670988722; a=rsa-sha256; cv=none; b=rPodacFNOC99fJ3HajO/X8GXjlkPQLEtDrLNUR/uIuZjZqOdGMEfX+0yAah40UYDuexBMY 26clbZtTXMdAMo/3W46x1CJ5vvIv5W2Z59ne0WpQ0qCV0ow4T5HGGGeao+EZ+zO/v0NitZ KJCuxtGO1xDVX4MmjEPliD/TGVwyXHKGXxVSbY0G3iF89KqTmZrOHwbnSqm7K9/BIuKGEB TnStEsEOp2K2fx60++ysFS19CL2TDuCT70CfVlse0T5yZ0gfFFxhWK+BBt7EB46R4bmtMQ 5c1C7tBqy8rGX0je2jrFcjARMe6jrg7D7QBWSVitihTCPmZiUngZAZcZ67cNug== 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 4NX1BV1j3jzf9x; Wed, 14 Dec 2022 03:32:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2BE3W2rx047682; Wed, 14 Dec 2022 03:32:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2BE3W2Qs047681; Wed, 14 Dec 2022 03:32:02 GMT (envelope-from git) Date: Wed, 14 Dec 2022 03:32:02 GMT Message-Id: <202212140332.2BE3W2Qs047681@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: 5050df3f4aa4 - main - tcp: fix counter leak for SYN_RCVD state when syncache_socket() fails 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: 5050df3f4aa4867ef8ab49e3116ade64442a5f21 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=5050df3f4aa4867ef8ab49e3116ade64442a5f21 commit 5050df3f4aa4867ef8ab49e3116ade64442a5f21 Author: Gleb Smirnoff AuthorDate: 2022-12-14 03:31:05 +0000 Commit: Gleb Smirnoff CommitDate: 2022-12-14 03:31:05 +0000 tcp: fix counter leak for SYN_RCVD state when syncache_socket() fails The SYN_RCVD state count is tricky here due to default code path and TFO being so different. In the default case the count is incremented when a syncache entry is added to the the database in syncache_insert(). Later when connection transitions from syncache entry to a socket in syncache_expand(), this counter is inherited by the tcpcb. If socket or tcpcb allocation failed in syncache_socket() failed the syncache_expand() is responsible for decrement. In the TFO case the syncache entry is not inserted into database and count of SYN_RCVD is first incremented in the syncache_tfo_expand() after successful socket allocation. Thus, inside syncache_socket() we can't tell whether we need to decrement in a case of a failure or not. The caller is responsible for this book keeping. Fixes: 07285bb4c22c026a50f69149d5dae03169b15fe4 Differential revision: https://reviews.freebsd.org/D37610 --- sys/netinet/tcp_syncache.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sys/netinet/tcp_syncache.c b/sys/netinet/tcp_syncache.c index 00d0ac2fa9d5..1a4cde642d4a 100644 --- a/sys/netinet/tcp_syncache.c +++ b/sys/netinet/tcp_syncache.c @@ -1313,9 +1313,10 @@ syncache_expand(struct in_conninfo *inc, struct tcpopt *to, struct tcphdr *th, *lsop = syncache_socket(sc, *lsop, m); - if (*lsop == NULL) + if (__predict_false(*lsop == NULL)) { TCPSTAT_INC(tcps_sc_aborted); - else + TCPSTATES_DEC(TCPS_SYN_RECEIVED); + } else TCPSTAT_INC(tcps_sc_completed); /* how do we find the inp for the new socket? */