From nobody Sun Jul 20 13:03:05 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 4blNxP3c9zz625JQ; Sun, 20 Jul 2025 13:03:05 +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 4blNxP2VxJz3PJj; Sun, 20 Jul 2025 13:03:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1753016585; 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=hen477/CQRd6GN6dWXyioShw4WnISChak09ze8dlP6s=; b=uAP3lxf+A/cV1O0rWZ5AK3ZxetWcuSeqI43p5UtV/XO4OfIyyxB27mKLKoVRS1+1vGLYR4 0BLXrqUpxPGyjpPWbQsQBxdjgyNUtclLwRrv0e4hB/AzS/6GOVLBjcpQ6KL4ih82aePtcH K3c7vLGuOlGtb4BJshz0tlgdNhaejmUEBPBH87moogcPlLO4t45BWMYJ73loR4lsMrqtSO WHB18TO/chCbxk6ajI+Sy2qW9sz5HGnYAmN19eVCoHnEB2Bf9KfZWWUgBvF0S63zJn/dDa x15Q5zbKxdQkeOCMQP7oki81GBi5ILcd0nvzrjC52ZyIxq9epdkrDaVP870m1w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1753016585; 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=hen477/CQRd6GN6dWXyioShw4WnISChak09ze8dlP6s=; b=T+yDXd6Nlvlq5gL2UZBOsQABAs6s4G9UsMKa+71kov4RA96eQhdMHbj+8spycFOP01wlCH oUEZYr7pyIkPM6/ISzXWVCpfBNVc4+s3XM81r28CQ8RTfk8oRJWGYQRy20VCw0yUCkrrX8 g+qzdRE7Wn+DelFVEOdiG55DevMB5rSQrNtUL8FhBwfD1bsFLRmsDy8d7l5zGDDM0txnYZ 7CJ4XNndJdW3PNhFljqRPm80FWWAZ/4RZHYcD4OAk0MVBLFmB6lDBYneZBwGUNa9ZD29bg ePzm3qHwwcJAAVtFKw+8SHB3pQgHLxBBqjEs2E+Sd3i5I+uAN2v4XBTTUVFXCw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1753016585; a=rsa-sha256; cv=none; b=oqvRdeZ2m2HcbqUbmfG3DIcHpwrHYfLYXWUe37pKarWpqJyNiTUhNd4RacdvMXTJRq47Dc p8JPMhIq7DrucjB6LsBWKwzD7xqlhOni/7hIHB2lfjZIFFFxt9cIeP7XjlP/YuXqk/LsGQ eei12guzK+P00NZR/dNH8pkMLZocuGCsrYksmE+0IvhJ+Cg2C0od6mjMIA5qC9g+qdSHAp AsZfARNO0emH78a3gjpzIz3dv/ekZ6Lr/WOpnQYKEAZvVo8Wf1aAtXYb79pnZziSnRWUAe 5ajql1NJkncvnlHMeomFQfyN5zkRtUs5VFrDvOYOFKH8aois8YQprzBfw8UD0g== 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 4blNxP24Xsz1CRh; Sun, 20 Jul 2025 13:03:05 +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 56KD358A025827; Sun, 20 Jul 2025 13:03:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56KD35lN025824; Sun, 20 Jul 2025 13:03:05 GMT (envelope-from git) Date: Sun, 20 Jul 2025 13:03:05 GMT Message-Id: <202507201303.56KD35lN025824@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: 7dc73fa66935 - main - 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/main X-Git-Reftype: branch X-Git-Commit: 7dc73fa6693564cecc36cda6788cb21c0c922ced Auto-Submitted: auto-generated The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=7dc73fa6693564cecc36cda6788cb21c0c922ced commit 7dc73fa6693564cecc36cda6788cb21c0c922ced Author: Michael Tuexen AuthorDate: 2025-07-20 13:01:00 +0000 Commit: Michael Tuexen CommitDate: 2025-07-20 13:01:00 +0000 tcp: cleanup Don't use the variable rstreason temporarily with a different semantic. No functional change intended. Reviewed by: Nick Banks MFC after: 1 week Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D51438 --- 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 f0921032ef31..1f60c0e07b13 100644 --- a/sys/netinet/tcp_input.c +++ b/sys/netinet/tcp_input.c @@ -1055,6 +1055,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 @@ -1064,8 +1066,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 @@ -1073,7 +1075,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