From nobody Wed Aug 07 13:44:25 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 4WfBHG0h9Pz5S99L; Wed, 07 Aug 2024 13:44:26 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WfBHF6bmjz4hpN; Wed, 7 Aug 2024 13:44:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1723038265; 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=hUsbUhBHNMVDoFafG2JK366kk0uN+9VCNkihdJGuZU4=; b=bnsXlTUOSjonsjYiP4X4ef+5PjAO/atKgHB2PwnRGNNHvfmZj9W7dOe+d7/ESQJhdO+boI u/T2hBjYcJiKmTDfDkSjOpS67oASL8MlExo/lbceyi4uGhpM/LkJP3d2n0mKF/xZWQmUyi /ECO8WIVz4o1ZknIosbq/Uybx3RNEVZWgt2XViGmos0F52v2LV49aN92pPAV5jz0AwzHBq F0bhEAMoqHDb5PWRumULDB9tfUFG3Gfqk9NCnr28VVEAHMN9LAjqODAz/NWYt6XUOR3RDg DFDdGecJslzJ6vw1vLFqKAKvufm/YJR4nH+fY+oB3fkoIe+h0yXhaym4I/AR2Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1723038265; a=rsa-sha256; cv=none; b=jvJngcToqIARIY9YLE32ma0x6BHzu7sncW1En5WPOf2OoQXLBt+R/cenj3Ou3oVLcFN0/S ZB1c+OfLZfQxYa5ofi6GOFy1N1o7FBat2nY2ROGvzKvVtmP3ms+do+QSdQe4mc7fce67q2 I/hnmN8FHsrR6gUzFJ7si5Q0K1nFfiChDymqWfXyehDxRKz0UjiecyX1sYZhzguzkxBpy1 5i4lhFvsP/8es2Y7bXvmwg9NLHA6bCUvxLFRSZelWkckT0QmYyu95htKeKXzqv4f6aLT2o 75OPVHNF9nj0XQ6GFLHha1b3lIG9yCh8W97I/BwQFWgHn9+JVl7RfbcQPRLhcA== 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=1723038265; 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=hUsbUhBHNMVDoFafG2JK366kk0uN+9VCNkihdJGuZU4=; b=pRUqNTw0xFIh2nKsrXvt80M5IonKb6Pbi9wiN4UUolXmr0ewgD6NOv8EvowP6t5bXxBtZo XXWxRw3oa8WlAuTtmI4M+Aoczkw2YqYSqTCr7vCTGHOjIbxIpNN5PrmehbZPEl1qxg+Xzi QdeBOmOAIyrmvScexZWVsDOJtkuybSVEjlAigtCx0HwxnML/9lrTsSO+0uzwVI5nMXEA4i FteTdqnnamvTFa2C5bRhx7kJ0l/4/NSCUxcv6otmVmDWBgMUfMXWsqyvWv1WETHEk6FGRU jdC0Hvx2GOoNDw1nB1i/ddwWUwqHqUhA8WawlsdGdFefyuaQCw0ag/wXxutd2Q== 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 4WfBHF6676zsV8; Wed, 7 Aug 2024 13:44:25 +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 477DiPvt033581; Wed, 7 Aug 2024 13:44:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 477DiPiY033578; Wed, 7 Aug 2024 13:44:25 GMT (envelope-from git) Date: Wed, 7 Aug 2024 13:44:25 GMT Message-Id: <202408071344.477DiPiY033578@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: a66d33fcf334 - releng/14.1 - pf: allow MLD LR to be sent without state 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.1 X-Git-Reftype: branch X-Git-Commit: a66d33fcf334ec0b8f5a13575f9788b269f4a3fa Auto-Submitted: auto-generated The branch releng/14.1 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=a66d33fcf334ec0b8f5a13575f9788b269f4a3fa commit a66d33fcf334ec0b8f5a13575f9788b269f4a3fa Author: Kristof Provost AuthorDate: 2024-07-10 12:36:18 +0000 Commit: Mark Johnston CommitDate: 2024-08-07 13:32:20 +0000 pf: allow MLD LR to be sent without state Change PF behavior to allow MLD Listener Report packets to be sent without needing a previously created state by MLD Listener Query. It wasn't working because: (1) you might not have a previous MLD Listener Query and (2) the addresses of the Query and Report don't match. ok mikeb@, sashan@ Approved by: so Security: FreeBSD-SA-24:05.pf Security: CVE-2024-6640 MFC after: 1 day Obtained From: OpenBSD, rzalamena , 5c526dbdb0f2 Sponsored by: Rubicon Communications, LLC ("Netgate") (cherry picked from commit 1afe4da75d1d2acd33b25eea942af28aa41c82c2) (cherry picked from commit 3382c691dc6a0d4e1f39ff67b5507f6542972498) --- sys/netpfil/pf/pf.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c index 275c29d20fd5..1cc85edfe3dc 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -1843,8 +1843,15 @@ pf_icmp_mapping(struct pf_pdesc *pd, u_int8_t type, break; case MLD_LISTENER_QUERY: - *icmp_dir = PF_IN; case MLD_LISTENER_REPORT: { + /* + * Listener Report can be sent by clients + * without an associated Listener Query. + * In addition to that, when Report is sent as a + * reply to a Query its source and destination + * address are different. + */ + *icmp_dir = PF_IN; *virtual_type = MLD_LISTENER_QUERY; *virtual_id = 0; break;