From nobody Tue Jan 02 19:06:46 2024 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 4T4Mlq00tvz565y5; Tue, 2 Jan 2024 19:06:47 +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 4T4Mlp6d4Pz4KFh; Tue, 2 Jan 2024 19:06:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704222406; 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=GlStfVjDadlkf8AcygazosHxFHzcoeBUkUbq7QH1ZQY=; b=nrAB0L8HmEjltgOTF3RnlSFi75o6wKHNgaUgl7frmZoIo7KMfNRA6kNqX8qlopjhAfOAmr BFriQ0e03pkEHTooi3A+fgNlpop6rhfQRbK+9z/YBjoTa11E/feInNrplamKQjO6XsYmGZ OkswioQOXsOObklIkIBMYhNSXUfE9/P4IrmS3TOI4w+2DCSJ3Abxdwjstth8vJ2H6Lf1tB 6zbtKsnxpfHd13cId6c8VjLXLqozFdsaVac5+seJVtl9Ce+RY04jawyJBLm4B3ndOr8CaV +aytFqO2lekjmW+HMMzXlf/bQDijT/pRhuzJAdMvF9t/e0mCX3B5XSb9Z4e9YQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1704222406; a=rsa-sha256; cv=none; b=MW5BBppF7EFaA7kAh8w4euK60PKAvVgie30Qcrp+wTBwP05UNcBBoLB5xHvcvAZMyzv4ZZ wpdzbslbkOI0OAmuKqow9mvxWE8to1+fvOC4UlCdy1ETO5jVPmvOWwuAxvFGomDeBkJUrG 0e/TehQPDxF0+/1cxck3fNTeTAeFpd96CgzTG5Os18oYfbwXHF8CINd4a8/0yzdqimi3cY Ix6xa3G6k4qJRc9DAmNBODq7b0vRbsZCt1PXZ8AP/dGREIpslqPkPspPNohK6/BHYhF4mG q4015c9HYYfoot9JUl7T7lYRrvNpVHoFRTcMv3OxQdBeEwmvMu2tNPrKXVFqeQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704222406; 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=GlStfVjDadlkf8AcygazosHxFHzcoeBUkUbq7QH1ZQY=; b=oXFxS4lXhAdrSL78p2vA+RWYGQeLloP33njxglC1XzVBQs0FFctf87sYvUlaA/YrmT4LjD CJf9q5baYOAv9D61utDANlyEbUffuJzbuGV5ax/LVcrC7Sa/z97f5tunTiepbu62jLe652 ia9XBqR+UIJaKZ1gUbp8C7c3dwTkoa6DNiiKucBnNyffWc/bOnOivYQu4Dki78XZBlCuvJ SaqoujnCyM9fXfF062OYXoLnBd6rbtcNy7n+VHlLMLl1E7s4pupiL96PmvMTBL7UNUIsTa Df9/wWi6Yg7uaoQblhdT7+ka/t/ySY5vUXSerzodQ1F00M+N/bHocFIAYNn6Fg== 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 4T4Mlp5gd0z1BP7; Tue, 2 Jan 2024 19:06:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 402J6kBL053347; Tue, 2 Jan 2024 19:06:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 402J6k7g053344; Tue, 2 Jan 2024 19:06:46 GMT (envelope-from git) Date: Tue, 2 Jan 2024 19:06:46 GMT Message-Id: <202401021906.402J6k7g053344@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gleb Smirnoff Subject: git: 943814893bda - stable/14 - tcp: always set tcp_tun_port to a correct value 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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/stable/14 X-Git-Reftype: branch X-Git-Commit: 943814893bda5d74d8a2cace0a613dd5733c2845 Auto-Submitted: auto-generated The branch stable/14 has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=943814893bda5d74d8a2cace0a613dd5733c2845 commit 943814893bda5d74d8a2cace0a613dd5733c2845 Author: Gleb Smirnoff AuthorDate: 2023-12-19 19:24:17 +0000 Commit: Gleb Smirnoff CommitDate: 2024-01-02 19:06:31 +0000 tcp: always set tcp_tun_port to a correct value The tcp_tun_port field that is used to pass port value between UDP and TCP in case of tunneling is a generic field that used to pass data between network layers. It can be contaminated on entry, e.g. by a VLAN tag set by a NIC driver. Explicily set it, so that it is zeroed out in a normal not-tunneled TCP. If it contains garbage, tcp_twcheck() later can enter wrong block of code and treat the packet as incorrectly tunneled one. On main and stable/14 that will end up with sending incorrect responses, but on stable/13 with ipfw(8) and pcb-matching rules it may end up in a panic. This is a minimal conservative patch to be merged to stable branches. Later we may redesign this. PR: 275169 Reviewed by: tuexen Differential Revision: https://reviews.freebsd.org/D43065 (cherry picked from commit 513f2e2e7180202167ca2963d815d2a4c3ac0af9) --- sys/netinet/tcp_input.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/netinet/tcp_input.c b/sys/netinet/tcp_input.c index 9f7e42b582c6..512da877846a 100644 --- a/sys/netinet/tcp_input.c +++ b/sys/netinet/tcp_input.c @@ -640,6 +640,7 @@ tcp_input_with_port(struct mbuf **mp, int *offp, int proto, uint16_t port) to.to_flags = 0; TCPSTAT_INC(tcps_rcvtotal); + m->m_pkthdr.tcp_tun_port = port; #ifdef INET6 if (isipv6) { ip6 = mtod(m, struct ip6_hdr *);