From nobody Wed Aug 7 13:44:57 2024 X-Original-To: dev-commits-src-branches@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 4WfBHs3Xlmz5S95V; Wed, 07 Aug 2024 13:44:57 +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 4WfBHs23KGz4jdw; Wed, 7 Aug 2024 13:44:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1723038297; 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=aMaySwb7vq2CuPoJwEa57L1urMSzK2x8zZFr1g5wCLI=; b=TSZWISSxkZyb0BjYk+O06aUwWXZ+A4+pCZEoUQpyOkLtwiFyyR3EHfE493pIYYlyt1YByD UcBWWVw4R6OmDQzs9ovjc6/fxc6WwGjGm+tZRux6+LjBSTIuJniXTZyPNguFpr0U1CqAVk AHSq1XzMA1F7LSOMasW1rTLQsjQTagteb9guTUW1ABpfiln7KbvBT2THyRjf2CZmqrV3Q9 eGIM/nXVi/VKcKP8tjaPTeFVJUn1tV4ba9N+fU2meaF+2QToe0ud29kohSofMKrngs0baL U8tIn0x+r3R8EYtEl+lWJh4g7h5tinz2BSO7Qm/u8Wi3GsLyKfRT+mFNY+qT9Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1723038297; a=rsa-sha256; cv=none; b=FATnPAxikj5HkOnBzoJ92pDgpXpvU12JkR5HMHSSY8Ksk2NxE/IV87Wot4DS4AgfTc/shN p0WdB+YlEB/dB6G7HXIJFw8MUpL5z6vmQaP3zSHgFE5vmJNFPi/kmzCUPrnLEksyfuSqBf Z+K7+ycu+pBZ58f6rSgvZCrYFHRqU75U9GvBW0lCqj4tSTyiAEOSGEeBQ8w7j3fILn4JyO vD4qq4PnKihi8Aa3aX2LgzrxoBBYlqpc5RbvqeN3KLRbaaxcq5OXLBQCr7UQLP17QzZv48 AUkpaokS1CQ0KB9uuYEowz5kqk53pvAM/qAu+vxiitSPTzGRP5lmDrEgq8YUjg== 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=1723038297; 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=aMaySwb7vq2CuPoJwEa57L1urMSzK2x8zZFr1g5wCLI=; b=IRTr7s7HyZnRu++yrpQ5CO+/AYD2hytWHaAk0f0Nn/pyPdcF4+iBd1zghsL7vt+p3JzN2/ aSkynWTu7Yhkx6XIYHZL5SJzQaBCz0Baj6JutQg19aUozgS8OKGoKua20b7ciD3A1rVF78 8AyaZCEm2jueavJTgaYPbarXm2eHScdjLin/CTjF9xqzQ7zCHh66Ib/JjJYlVOMWZAtwCm uebZ9ATgOp13W3OyGlHWtJj3d6ozBN70LZ0Z4XcIELDOdX9Ylf+vEi+J4d4rVYY4iCG2HU bY6rXrSIgWGPdJyE9dEY2b3QeruI2ZsYJogWGvoYkpNoo1Sb3dY8Ll/SMenD5A== 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 4WfBHs1ghszsrb; Wed, 7 Aug 2024 13:44:57 +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 477DivCH034875; Wed, 7 Aug 2024 13:44:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 477Dives034872; Wed, 7 Aug 2024 13:44:57 GMT (envelope-from git) Date: Wed, 7 Aug 2024 13:44:57 GMT Message-Id: <202408071344.477Dives034872@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: 5eb30c313cb0 - releng/13.3 - pf: allow MLD LR to be sent without state List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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/13.3 X-Git-Reftype: branch X-Git-Commit: 5eb30c313cb051385d654f7bba36143ccb7dbf94 Auto-Submitted: auto-generated The branch releng/13.3 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=5eb30c313cb051385d654f7bba36143ccb7dbf94 commit 5eb30c313cb051385d654f7bba36143ccb7dbf94 Author: Kristof Provost AuthorDate: 2024-07-10 12:36:18 +0000 Commit: Mark Johnston CommitDate: 2024-08-07 13:37:32 +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) --- 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 388d632e8d50..96d67d906a4e 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -1797,8 +1797,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;