From nobody Thu Jan 05 22:40:46 2023 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 4Np1dp5Lckz2pRRh; Thu, 5 Jan 2023 22:40:46 +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 4Np1dp4s4Jz3nrW; Thu, 5 Jan 2023 22:40:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1672958446; 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=x25XMdpcJXvpAB13Wtpmn/KdK+QN/9RzoNvYkgCdHoE=; b=ap1ptcOhZ923+OVwEKkk9fEcy0NslMrWGdRobA2p4QsaK2qwzq+mhNYuHQ+Co33rLvUTnE IALhoPbvAuWhxeUEXiRzBbaLzAvX1xIZ0Hd641dkypGJeOIvNweuiy0hUOix3hMHBA9wst ZfSR0lY51g/+V+zCHBr9SAUsQI/7ljlINcrTqfbQ9ThsooKd1ZdaXO+TQI+Gaw4VWBmR2G LHAZtfSgxSdvNsbCNaJfOsXmUXVDdr17UZUAXDSsZGP4vl0fAF04vPMDMY6/Kad8lXD6Q1 kfsEN/e8APl7cxDaIG8mw55LbBXtZoHTcNQIW1tjJPxZxa1UMoZk6aJcGAiiNw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1672958446; 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=x25XMdpcJXvpAB13Wtpmn/KdK+QN/9RzoNvYkgCdHoE=; b=UO3tFv6MsgeXc3HN5ywHfg5H52rKzm0MFcYCJ6Sg48b59t3/r//2G+GKFWrCYP9LpXiGgD 9/xucQLlde6aqxME8YtPk8ybSlY1GJ1uo/70Jc6YfMwQwC1rF9ssXpYbMujeaxmFe2ekMY JDcr3fG2YzxFhmud9jn4kerA77oY6n7qqURDcG+0gz/ZW76W96nwsvGdbFqt0hzbQmNr8V tlrYH/CMUU+gzqlFlpnJtcTlIEHhfG2+sQIuq+JLKUFWGvDrKk+lUdqkrj1zs82C0968GF wVLrSP5CKZSxS7aUeHi1Zppf/sb31z3zwRN236p3IRBXsraw8ePN/ZdZNK/RVg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1672958446; a=rsa-sha256; cv=none; b=BO9jtMVzhitm8Rsl65Z4LNCEdoZV7JAtjGBb0A7p96uBEvLxhsobSpC1ansIQEm1SvlnEM trvkO3mEWHuGTMhacooXqkTzIZc1VUo9oN5oIRB7VK+3nU8mLKWo25ZxDtlwM96senbd0k YmDr9CawVqeSOOIGlaRqkGJxBFv3E/aFXyFQxwq+nh8mEEjHuk8bSFR+f4MIv+nt3x/BWD 13dqs4zirhczxZn58tDmSNEnI32mWQt1jI2t646oqlnjkI1QLjO0HU3m7tlCVrZahp+tyi bMSPw9vh8osRh/cg36+O4csyku7LgMLWJTc+suNyq+roBU0toXNA2mLtIGgR2A== 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 4Np1dp3wBFz16lP; Thu, 5 Jan 2023 22:40:46 +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 305Mek7I043690; Thu, 5 Jan 2023 22:40:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 305Mekvd043689; Thu, 5 Jan 2023 22:40:46 GMT (envelope-from git) Date: Thu, 5 Jan 2023 22:40:46 GMT Message-Id: <202301052240.305Mekvd043689@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: aab8c844b91a - main - tcp/ipfw: fix "ipfw fwd localaddr,port" 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/main X-Git-Reftype: branch X-Git-Commit: aab8c844b91a74f9b0e9ccc3b5dbc9be4007e293 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=aab8c844b91a74f9b0e9ccc3b5dbc9be4007e293 commit aab8c844b91a74f9b0e9ccc3b5dbc9be4007e293 Author: Gleb Smirnoff AuthorDate: 2023-01-05 22:34:50 +0000 Commit: Gleb Smirnoff CommitDate: 2023-01-05 22:34:50 +0000 tcp/ipfw: fix "ipfw fwd localaddr,port" The ipfw(4) feature of forwarding to local address without modifying a packet was broken. The first lookup needs always be a non-wildcard one, cause its goal is to find an already existing socket. Otherwise a local wildcard listener with the same port number may match resulting in the connection being forwared to wrong port. Reported by: Pavel Polyakov Fixes: d88eb4654f372d0451139a1dbf525a8f2cad1cf8 --- sys/netinet/tcp_input.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sys/netinet/tcp_input.c b/sys/netinet/tcp_input.c index 5141903522bf..606f6649d73d 100644 --- a/sys/netinet/tcp_input.c +++ b/sys/netinet/tcp_input.c @@ -834,7 +834,7 @@ findpcb: */ inp = in6_pcblookup_mbuf(&V_tcbinfo, &ip6->ip6_src, th->th_sport, &ip6->ip6_dst, th->th_dport, - lookupflag, m->m_pkthdr.rcvif, m); + lookupflag & ~INPLOOKUP_WILDCARD, m->m_pkthdr.rcvif, m); if (!inp) { /* * It's new. Try to find the ambushing socket. @@ -865,7 +865,8 @@ findpcb: * already got one like this? */ inp = in_pcblookup_mbuf(&V_tcbinfo, ip->ip_src, th->th_sport, - ip->ip_dst, th->th_dport, lookupflag, m->m_pkthdr.rcvif, m); + ip->ip_dst, th->th_dport, lookupflag & ~INPLOOKUP_WILDCARD, + m->m_pkthdr.rcvif, m); if (!inp) { /* * It's new. Try to find the ambushing socket.