From nobody Tue Jul 11 15:00:09 2023 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 4R0kZ16X53z4h4xm; Tue, 11 Jul 2023 15:00:09 +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 4R0kZ1615hz3BpP; Tue, 11 Jul 2023 15:00:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689087609; 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=Up6Ms4g8mRWx5D26Z53w/LHf/0JoybuIpGpdCqbgHw8=; b=Em9GOkZWLgBuEWIaLE1u34gfUJ434LR5zi7d0C2HUY6g2TdYZsW9N2Q6Hlxfg4L9a1+Daj 0q2FSiolyn3S3ly7s22OeDVm8T5omHFT13oZlvCZmiiE3c0vgfHTP9edpEDpV0xj9tMPAw TiROQLnsTyxf7dVW0TMDXBOI9f2NeM99GY0D6rnTzhMopPZINoJuP0qOt+hDYDBQUjJInf 7KITDbL44mAss6HA//8tv3vGBQ9EmdwwvCJYN5H0vyeJSwuUFhtPuehGKn+bupnmA3nXQS 29UKFF4EsNKgWqPlLyeyIdsxeHBoXdaYGwXYxeHN/AxWIzcS/5cPvMIRu0PT0w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689087609; 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=Up6Ms4g8mRWx5D26Z53w/LHf/0JoybuIpGpdCqbgHw8=; b=U2AhWinYCg9bCCLyv7vm853a05BIkVmsY+cmW87r2q8G5+MzYUehyQx8f+ZOSwNlv9uO7T VCLuTeroCxhxUw0TJadhlAt+qIeeZahErtp/Mj3me0ZBIrcNJwRgMMwoUjUX/fbIN8AMyt nSBShLSagIuO9fAumUDH9zmpbStvhea3/asHRma0A8CsZ/hvQieO53A7mEDf6uds9Lvgkt GrLSWlM9Iv1C3JLaG2B3y8RFXlY/xYWLQM5wOZbJTd1bXT8QN2kX94/PBTv0a0wvJFKUeD 3+AYFvHe15JiZd2Re8uTNi5O4rOHwMJwFF/sVQjHvEwH3w6MnJPbJFoYL9V4OQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689087609; a=rsa-sha256; cv=none; b=XVzWjcIb5vRofhr4L+AjRSKpe5BXXqr8dXDf9b6GtYFbDb/u4ig5NSOYLC0NNjXiEIP/Ig x8HzJHgR/v2PVRzcn2xgbb2ssT05ty03yHv5GBoYWSDoZpGpKqtDTHEiCWLU+tHe5GJHXm unajCMwtOd9Kx7tf1MaHvq4jXfpHLRbtZdZTmXQapChjp8cGE8znSgqQHa9UwyfRgx7FcK hvF4AIKa4JFa2pS4EDgYkccSqPdQGmvD/v0BBZpTwIx2bSWCvQthQPjZLIANyUSihfy2Vf P/vikpIhg5gCYGDmaXEMXfS/s2dA1djuu7fJxbhqyZOBPtvmuxNj6qeBfdkfNQ== 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 4R0kZ156VgzVwC; Tue, 11 Jul 2023 15:00:09 +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 36BF09JV095625; Tue, 11 Jul 2023 15:00:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36BF09Uk095618; Tue, 11 Jul 2023 15:00:09 GMT (envelope-from git) Date: Tue, 11 Jul 2023 15:00:09 GMT Message-Id: <202307111500.36BF09Uk095618@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: 66f2f9ee0877 - main - ipfw: teach ipfw that pfsync is an upper layer protocol 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: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 66f2f9ee08770f2d2ad7de4dbb07ed77fb870a0f Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=66f2f9ee08770f2d2ad7de4dbb07ed77fb870a0f commit 66f2f9ee08770f2d2ad7de4dbb07ed77fb870a0f Author: Kristof Provost AuthorDate: 2023-07-11 10:37:17 +0000 Commit: Kristof Provost CommitDate: 2023-07-11 12:59:08 +0000 ipfw: teach ipfw that pfsync is an upper layer protocol Explicitly add pfsync as a know upper layer protocol so we don't automatically discard pfsync packets (carried over IPv6). net.inet6.ip6.fw.deny_unknown_exthdrs defaults to 1, so even if net.inet.ip.fw.default_to_accept is set to 1 we'd discard pfsync (over IPv6). Reviewed by: ae Differential Revision: https://reviews.freebsd.org/D40973 --- sys/netpfil/ipfw/ip_fw2.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/sys/netpfil/ipfw/ip_fw2.c b/sys/netpfil/ipfw/ip_fw2.c index 766b978fbaf5..41420563ab5b 100644 --- a/sys/netpfil/ipfw/ip_fw2.c +++ b/sys/netpfil/ipfw/ip_fw2.c @@ -69,6 +69,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include @@ -1718,6 +1719,10 @@ do { \ PULLUP_TO(hlen, ulp, struct ip); break; + case IPPROTO_PFSYNC: + PULLUP_TO(hlen, ulp, struct pfsync_header); + break; + default: if (V_fw_verbose) printf("IPFW2: IPV6 - Unknown "