From nobody Fri Sep 5 07:25:47 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 4cJ7DX0zdhz67Db2; Fri, 05 Sep 2025 07:25:48 +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 4cJ7DX0BBqz41s4; Fri, 05 Sep 2025 07:25:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757057148; 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=8NPG5eKXu0CNN8GAieWN9ItJ5ZZo+iwy2ANjB2COJHw=; b=s5V4Ze2WIc9a0VbBDW78mK41bDgXk2w948iM2lRFqvOKAD4e+pxpqD57mmJQXcl9VlUh94 gGJ+wMr6R2CKrT8uR/vy4XkbNylTPMxRu7UpAtRqypkGpWQ2zs8Frps3gVpCOat2JPizJW wgeDB5ttFaJmhdlK84GeAxcwvESequNcgsz2vDqHFHRda860Ka3MtJGkPRN0CkDXvtuEZk paZ7Ky/LYppUF68eLW2ufE0f/46jGzHlSdzldMfZmi9tQ31bqQMtRto/febiOUGbdJmyU5 dLj+12cGt+v+wpGTiK6japv6z7ityiFRkFDLlpgZ/uY43IqanwbUa4VC38Rftg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757057148; 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=8NPG5eKXu0CNN8GAieWN9ItJ5ZZo+iwy2ANjB2COJHw=; b=HHWL/e4pgVvNohO6iLwPy3dGx9XsJzvbrIek7UfBetqdUafRJlHEC7+l9bPW0UMe4OhUeI mzQhwzvPfa5byEmkuWsUo/LY/Yc9DAehhMM22YGRzWwsiERtq0QAw7f/yTLuZK/Dn62k11 zef4RWtxGBErqrUf+gi8hTV4gz4CKHrwhutEZ8cQ6eTXp3yFEGUYlILBbBTvchun4Dw2lW 1bapuC2L+nq7tCS3wi/Zo1X4/BfZ0O2phaXVy0mOyF0whT/FTKANawTHljUSLaEiCQlY4z mC0fxt4kLk93+UbRHA3IcO5nw1BC7fz74prLHIjNnY2OP3sGL6osfbvbwyqyZQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1757057148; a=rsa-sha256; cv=none; b=DsEEYsWSvqCsa0Awj+w9CtWTc+9q5RG2gZo9tjXRQ6C/xiV3Aw46NusX9SW8EvntU0kCCI HAGmyWIe2LywkKnffFUKEnxHC0cRnmDueiEuCBhlEizrVOWAJvumEY2upIrASuIqDKfj5Z TI9+LPkbVov8+HU1ZbrZAR6gT6SdEfreJpMpcc2L+X3qwIpKK+iq7oooyQxKCox5eCWVCH GJ8APJlF75dQSNs/JnycQtQG/EZVSRJbLJLP0RZZV5VVlxE1xI6uHbbbKQGcBBz44+G4e1 RjprkZIY5/vLT0YsGn723oeOrE2gW7hrkHSGBcLkvBJgNuTpNKfmuCJ7lK2rUw== 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 4cJ7DW6cbqzfSW; Fri, 05 Sep 2025 07:25:47 +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 5857Pl4i020524; Fri, 5 Sep 2025 07:25:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5857Pllm020521; Fri, 5 Sep 2025 07:25:47 GMT (envelope-from git) Date: Fri, 5 Sep 2025 07:25:47 GMT Message-Id: <202509050725.5857Pllm020521@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: 560ae99e226f - stable/14 - tcp: cleanup 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: 560ae99e226f57bffe13d165f645ddcb914afa38 Auto-Submitted: auto-generated The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=560ae99e226f57bffe13d165f645ddcb914afa38 commit 560ae99e226f57bffe13d165f645ddcb914afa38 Author: Michael Tuexen AuthorDate: 2025-07-20 13:01:00 +0000 Commit: Michael Tuexen CommitDate: 2025-09-05 07:25:02 +0000 tcp: cleanup Don't use the variable rstreason temporarily with a different semantic. No functional change intended. Reviewed by: Nick Banks Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D51438 (cherry picked from commit 7dc73fa6693564cecc36cda6788cb21c0c922ced) --- sys/netinet/tcp_input.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/sys/netinet/tcp_input.c b/sys/netinet/tcp_input.c index f4d061557e88..10b422c300b5 100644 --- a/sys/netinet/tcp_input.c +++ b/sys/netinet/tcp_input.c @@ -1072,6 +1072,8 @@ findpcb: * socket appended to the listen queue in SYN_RECEIVED state. */ if ((thflags & (TH_RST|TH_ACK|TH_SYN)) == TH_ACK) { + int result; + /* * Parse the TCP options here because * syncookies need access to the reflected @@ -1081,8 +1083,8 @@ findpcb: /* * NB: syncache_expand() doesn't unlock inp. */ - rstreason = syncache_expand(&inc, &to, th, &so, m, port); - if (rstreason < 0) { + result = syncache_expand(&inc, &to, th, &so, m, port); + if (result < 0) { /* * A failing TCP MD5 signature comparison * must result in the segment being dropped @@ -1090,7 +1092,7 @@ findpcb: * to the sender. */ goto dropunlock; - } else if (rstreason == 0) { + } else if (result == 0) { /* * No syncache entry, or ACK was not for our * SYN/ACK. Do our protection against double