From nobody Wed Jul 31 07:41:11 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 4WYkYN21dqz5RPNK; Wed, 31 Jul 2024 07:41:12 +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 4WYkYM6Nlrz4qg5; Wed, 31 Jul 2024 07:41:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1722411671; 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=t8SqNM5VTKgWrWx7hDcPsaWUIyFNwmTvMxMWcSMc0Ms=; b=CV24rspPA6OEtodMtSc97TjD0YdFnLT1U9mA/P2VGQz5Yp+JOBLnAuQfFxB/77KmK2k/Y1 C/cv+bPMmV5wIfvy+ySY92oebqD/W8G1biQwjP2sIY9z5JhJc5KdhVGD2w2J2j7+Q3ji2w J3dSdAg6B4FMLfoij2J5RqNT3p83HTCqcKtGRzWoSnOdpzBy1cJa1aEWnqBXnDAkbp0i7v 7umK7OcZL/lxhkW/CJUEqJNp9FNpg0Nu2bs/DntgXf367iB007qh6EH+CCIPBGS29Dzmoy UWhPdyLbP8+B70llwD03c9t/y5l1kun3DYT7M+Di5fnWSo6KA+mZmUChOqjGOw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1722411671; a=rsa-sha256; cv=none; b=gf8iSKx81LJ2LQM7pSUYBFahVADSNWi53zOEAnN3R2zlVVnm2Uoi9tLuT/hfhAEVWrwl4y DTlWKrZCSsERCZzcc7tfgoQ3CwHCroa/S+HfGSBUjry+MFazlHmRC7RkLV3eyJFNSua8qX yYEe9nXfxZi/7+asE3/YiwMr0IJCH3mLmByq37O6DuEpnoTKQAZdI6eaJsXHJUJF4/IkKq m+nhY2hEnFcpok1r5hcmaP2mbxm0oXEe2snoedl99Y/rTkpoU8v8iVd8QN/tpHbsah4Vre PQm8nyBMNl6xZGMSPsYtecIjBt1DEUvPQsM2oUg5wACuARtSRi8Uo3dI16rD8w== 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=1722411671; 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=t8SqNM5VTKgWrWx7hDcPsaWUIyFNwmTvMxMWcSMc0Ms=; b=CU89MAHaDu5BShSYxq66SWtmH7BtTtatgV/1lBVzKrse+1Xy0SEcCCVTX0Nq0duJI6A2WA U5s9wT1VIdgHSIysRIzXW26lzOESfU3Ub1uuh4ukB6fZtu3mu8OSQ4F60hMJqKVtV0DxgX cehux/Hg/I9aPz3Xyvwky3FpiCg3F1kOeuSue/oZC3+xQ5ULwF6LAueKSltm+FWJpA/Dof S2MNgNS3b+D4ZvWOSTyDlAqPfw+fPqQm4BRtWyRs8E9WWpBJRXWlTK3ohK63rhKepG1GMW 6HtyFBdc5FR0YurGZc9n2pujUUjlnCeYV+we4B9m+2oDk2pFtybXfpTgD0JhXQ== 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 4WYkYM5zszzsYd; Wed, 31 Jul 2024 07:41:11 +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 46V7fBL9084761; Wed, 31 Jul 2024 07:41:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 46V7fBfO084758; Wed, 31 Jul 2024 07:41:11 GMT (envelope-from git) Date: Wed, 31 Jul 2024 07:41:11 GMT Message-Id: <202407310741.46V7fBfO084758@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kristof Provost Subject: git: 3382c691dc6a - stable/14 - 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: kp X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 3382c691dc6a0d4e1f39ff67b5507f6542972498 Auto-Submitted: auto-generated The branch stable/14 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=3382c691dc6a0d4e1f39ff67b5507f6542972498 commit 3382c691dc6a0d4e1f39ff67b5507f6542972498 Author: Kristof Provost AuthorDate: 2024-07-10 12:36:18 +0000 Commit: Kristof Provost CommitDate: 2024-07-31 07:39:53 +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@ 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 261a52a7c2f0..1fa60ce9d051 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -1854,8 +1854,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;