From nobody Tue Sep 2 21:10:50 2025 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 4cGdgv0Wx8z65S4h; Tue, 02 Sep 2025 21:10:51 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cGdgt6cRDz41w5; Tue, 02 Sep 2025 21:10:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756847451; 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=+WItCKKnTu9fLdlsuyJD6sytTWO7D3z2uguWJKd6APU=; b=Y72rcICPz+swMRup3xXJlO9xFUAHoRJAKvNHVkaSDc9HYEKprjGPFUqSqU2/F9yhwDrEmY vIpZW+ZM499zEMTIu2JzYOSb20vDcmn8wQQ/Gc0oAepiCnGrIzJMsgb23WBFEY2YTwC8r2 +QSp51ALGtRnd2mjHlG5irAUtySv+VSU4StbwdNzrSp2f6indNSM+Yl3zsg6/dligguhop 05drtl8oph6lqqgkt5t5qj/NQPpXKOYIZC5po+3P+ngEdjyJqdZIDcK5CGHm8LJmEqJ5o/ bH+SAlL8OFMyXQDGrLnJHwsIfXGRsAjx5uQhgn9J3nnWspEPb0zmET2OFwfsQQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756847451; 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=+WItCKKnTu9fLdlsuyJD6sytTWO7D3z2uguWJKd6APU=; b=AR2uGVM5162iFAlsEo1u0zBr0zHqQJo5lyk26YRvhzeZSPka5qDkWsQQUa4uxD1GG/xQz1 hojORw6AR6rh882jc+0HUpTjMO1xmPfGZDuoNbZBJiHynRqia1KWiJ+zSkA5AskCNHb18K i5zZwNvmfSSiLC4qKbcVUeZlsDkFHOhJzHoBugqymmXPv9dUwyKWzDn+3cS4B+KQbLCig3 xGeJUDXeMA43EjKVZe5jlU6eWERY7KnpqWbJT+/egl38XnW7DM/ThR5EiEHCE5Ih5J/OgV B62erajYWVSyVjfZseYBXoJoYuPHzS12m3NE/LkK+iwGU0lrB9H9EhjEtfCqAg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1756847451; a=rsa-sha256; cv=none; b=vAG/SG053wZRB83Fhq0LLwhV92oqae2wbHNgSFQBZxX6RWaSHgdiC731wmN3R0eboUDL0J qZ1pIFHB6iyv7wQba967c7SNQQd82fIP0o3Ods6V3wUDGBjl+DWLRFIkpXJNZFqboqbqOj uL5ZLt3+7QdFl85Tpe2tGfOu4DDuNQS0s8x8IaplC8ByZf46rtev4rWb0eOCISRiaL/zwe MUkY3mpuWbeXoWVJBxaCsh8yLqAh65HzW4TiXdlU1El77uZfJF30Tr3Cai41XUT5kB8sst eY+JCamBjyueZxUNrWTZBGq9R53o1apDUK57VSUbDCPSW64ueylq5Be7/PKBdQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cGdgt638xz12Mb; Tue, 02 Sep 2025 21:10:50 +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 582LAocv036367; Tue, 2 Sep 2025 21:10:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 582LAoFb036364; Tue, 2 Sep 2025 21:10:50 GMT (envelope-from git) Date: Tue, 2 Sep 2025 21:10:50 GMT Message-Id: <202509022110.582LAoFb036364@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: 67082c75f740 - main - pf: should be enforcing TTL=1 to packets sent to 224.0.0.1 only. 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-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: 67082c75f740ac63d068f154ca0f88e71a3ca960 Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=67082c75f740ac63d068f154ca0f88e71a3ca960 commit 67082c75f740ac63d068f154ca0f88e71a3ca960 Author: Kristof Provost AuthorDate: 2025-08-12 15:22:30 +0000 Commit: Kristof Provost CommitDate: 2025-09-02 21:10:19 +0000 pf: should be enforcing TTL=1 to packets sent to 224.0.0.1 only. Issue found and kindly reported by Luca Di Gregorio OK bluhm@ Obtained from: OpenBSD, sashan , 58feb3ffc6 Sponsored by: Rubicon Communications, LLC ("Netgate") --- sys/netpfil/pf/pf.c | 9 ++++++--- tests/sys/netpfil/pf/igmp.py | 6 ++++++ 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c index 4325835c7671..a9d89afd58a1 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -9997,9 +9997,12 @@ pf_walk_header(struct pf_pdesc *pd, struct ip *h, u_short *reason) pd->proto = h->ip_p; /* IGMP packets have router alert options, allow them */ if (pd->proto == IPPROTO_IGMP) { - /* According to RFC 1112 ttl must be set to 1. */ - if ((h->ip_ttl != 1) || - !IN_MULTICAST(ntohl(h->ip_dst.s_addr))) { + /* + * According to RFC 1112 ttl must be set to 1 in all IGMP + * packets sent to 224.0.0.1 + */ + if ((h->ip_ttl != 1) && + (h->ip_dst.s_addr == INADDR_ALLHOSTS_GROUP)) { DPFPRINTF(PF_DEBUG_MISC, "Invalid IGMP"); REASON_SET(reason, PFRES_IPOPTIONS); return (PF_DROP); diff --git a/tests/sys/netpfil/pf/igmp.py b/tests/sys/netpfil/pf/igmp.py index b339a2825082..5d72a1c093a7 100644 --- a/tests/sys/netpfil/pf/igmp.py +++ b/tests/sys/netpfil/pf/igmp.py @@ -93,3 +93,9 @@ class TestIGMP(VnetTestTemplate): options=[sp.IPOption_Router_Alert()]) \ / sc.igmp.IGMP(type=0x11, mrcode=1) assert not self.find_igmp_reply(pkt, ifname) + + # Or with the wrong destination address + pkt = sp.IP(dst="224.0.0.2%%%s" % ifname, ttl=2, + options=[sp.IPOption_Router_Alert()]) \ + / sc.igmp.IGMP(type=0x11, mrcode=1) + assert not self.find_igmp_reply(pkt, ifname)