From nobody Wed Jul 31 07:41:12 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 4WYkYN3ZNdz5RPNL; 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 4WYkYN26kmz4qSF; Wed, 31 Jul 2024 07:41:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1722411672; 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=z4oFDFXVM4RBM9gLQWsXnAaJIOqoxmqmJEvKNSHM7qk=; b=oMCj4CveTng/uF1MjY47VQyytVRg928usk1tf+hDi16KoeM4GR5Z6tiA9bNfpTHGd7KYRF Pegws6D1TmfNvhs0QaEv+4GuzI5CFuqla5F+lLIXTyegJCkG76pbQ2k+b0xp8QrXMyliJ+ qr/rAjGIqgPUZkW7zHZQ4/5nIK3ATOGiPREHPVGk06KBPkjMQXW8UZYrfw8FntTp6MOxg0 Ajm8k7NbGb62MLo2U5WdNygGhg7/U2s62ZBq7pbMvYGjlVYAhAy+oLnq6VX43aFzNiapLx zZ2RtwRIQ9RxbkmVL+AUSXX+CBFagodkQnDnWuGtkDhMP7LlOAaDcM+rRT2WxQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1722411672; a=rsa-sha256; cv=none; b=tfODAoC8IMwig0I9HBx+KDD+0hpAXgGNI6aH4tAsLAYXAg6+n1DsX6bxKceeb91CZEp9hJ KGed+FXbgpANQMBySjknrTyqnVmQ9Bd6X3Aza7Nrz/hSQDNCz8bYyk0yTziXykPtXassHI SH64p9yNXVPxp+8SC1dGkilO4jB2TOtZIQB+HEl/2mOhv39vyXy4G8pjo5SlRdAOm/K3Fr Jg24RTtpAdA6UduZvsdbB/3ouwp8WfiiwEhn8uTkL4v7aeE25onU27vvj/gguxufGSgkVq qq2InhQ6OMiAbhXeL0e7NQVrsjn++TmYn8qnrztqs7Brbsm1sflu6nFQLWzl/w== 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=1722411672; 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=z4oFDFXVM4RBM9gLQWsXnAaJIOqoxmqmJEvKNSHM7qk=; b=SIiWU6RYXPnZqqctKX6IJaHJiWLazvZHD9sJZxJwI/M7bil6E4DAI2GvIPUhFWpNNWLiAO DNNpxaSxAloiw2lhwoYj0bJqm1F7jUQPmgBm0x2rOgGcqnP16REget/pRX1+I3HtcZiljK hoqHp39I18FJSH8OdtK4JuSsm3UMqvQO0jquD0LAlZLxXQTCjAwevXweQXx7FQlv7rFto2 6OOH+2cooXrBqjGUybCM1nV81U1HrzjWhBg0Gr3lMJ31YIw/pBPbUbBpZ/2sH46SAAK9k8 nOe/o6Bpb4goBHGLw4KWleTN57bBWIt/Ipj0j36FMIWwSJ+8Xvs1Kja0YXfrAA== 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 4WYkYN1jqczsSw; Wed, 31 Jul 2024 07:41:12 +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 46V7fCi9084815; Wed, 31 Jul 2024 07:41:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 46V7fCfG084812; Wed, 31 Jul 2024 07:41:12 GMT (envelope-from git) Date: Wed, 31 Jul 2024 07:41:12 GMT Message-Id: <202407310741.46V7fCfG084812@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: 05f91f8dd5ce - stable/13 - 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/13 X-Git-Reftype: branch X-Git-Commit: 05f91f8dd5ce46d274feff11103249e3d9428f38 Auto-Submitted: auto-generated The branch stable/13 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=05f91f8dd5ce46d274feff11103249e3d9428f38 commit 05f91f8dd5ce46d274feff11103249e3d9428f38 Author: Kristof Provost AuthorDate: 2024-07-10 12:36:18 +0000 Commit: Kristof Provost CommitDate: 2024-07-31 07:39:35 +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 767fecdcb3f1..07d0604e924c 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -1807,8 +1807,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;