From nobody Wed Aug 07 13:44:54 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 4WfBHq2KM9z5S9PP; Wed, 07 Aug 2024 13:44:55 +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 4WfBHq0H9Fz4jqH; Wed, 7 Aug 2024 13:44:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1723038295; 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=H/R9FXYTz/ciFCFBpaouxYr0+voY3o/itVtR5PqxcM8=; b=mI9hbgBgVx7t5Qv44l4g0/a8jWx9xHuMAb3TaymX+r3WWEFHY9h/mSG2yXXZG4QL8kn/cl /DnRgwFftKce5ZTMXLdk79012Mjrt/VFPAXfv977fAyrVMm70SEN6Umb1UkNZWoLCHl0V6 iTiI2nwebFEYnlg2Vq0ld0ldhj/x9ZnE5v5iV1nqGqRRjnJIAzzM/E/kArERCUVuzlrnNU pyncufm5Dz7IMss9rrGPVgT1J7a+dyrHuS1PFioFWj09woTz0AcKrEyjzTSOa4GkQmB8bf km+LtVc8proZtbF5FE43VoYo5qHysIYV9gBYsiFA8gCCh06ocp+yDqaZ4lN2Yw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1723038295; a=rsa-sha256; cv=none; b=aNWYgiZ9mPhMLld5uuF+pl9WaLhFjXM1ULamQ2zVt4pVxKrpmxKzSzHknXEWhn6a9Rqean omO6OWqCmCzKzD5HnMlfFcv5lYRwM366KuKxe4oKmMPdkz4gMkN4PBfNk6QAvh1k5Afe7e NKR3VFA5/tzlQrT4AJuKyPSUEvO9zXW1klImKbCelOW0EhuVw+/mgu6AU5UeHKs4dniq8h J8BZzBr8O1bxamC37nTpVDRbzx12uPzTE+bakYF+4Rb9mv62HoF/vSQQta/ZnSwnAOy8/S XvgIb46vUJoh0cdsaBPDUHZe5lC/hMxR6WBN0aS34+uZVZURyE798VXNoypziw== 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=1723038295; 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=H/R9FXYTz/ciFCFBpaouxYr0+voY3o/itVtR5PqxcM8=; b=x39164fuaBw4MXpkUP6EX2bvxNt/ScRn3xol6mDgZ4JAvWzfeGf3w2QngM1NXPhm9mGVsc E5shbtuVscKlc4PM4kBimdQ5ScCCEW2qiwa6uIhbH9IZeY9ixf4KpfD2OoP6CB1jLzkXOD Vn4vph9VhV97jg8C6y7orZD73qw2lNJ7vuZSlTQsCQQOcT5NGMwbjxuW42GNiN5kpYxo0+ c31hpcUErkTdauzaKe++UQ0NungFEC4ofWanHHPtMBVH/GclVIzLkllhD1MDxf9BskAqyD KR7AAEP9X3kIoouxwQHd/K3595LcjQi2o/vznx5ZOQO3D6lOyRr7AbaHud5t+A== 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 4WfBHp70MBzsjS; Wed, 7 Aug 2024 13:44:54 +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 477Dis59034764; Wed, 7 Aug 2024 13:44:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 477DiscO034761; Wed, 7 Aug 2024 13:44:54 GMT (envelope-from git) Date: Wed, 7 Aug 2024 13:44:54 GMT Message-Id: <202408071344.477DiscO034761@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: b778bbead38a - releng/13.3 - pf: some ICMP types that also have icmp_id, pointed out by markus@ 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/13.3 X-Git-Reftype: branch X-Git-Commit: b778bbead38ae9efa366a3542441c451e8fb1660 Auto-Submitted: auto-generated The branch releng/13.3 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=b778bbead38ae9efa366a3542441c451e8fb1660 commit b778bbead38ae9efa366a3542441c451e8fb1660 Author: Kristof Provost AuthorDate: 2024-07-10 11:32:03 +0000 Commit: Mark Johnston CommitDate: 2024-08-07 13:37:24 +0000 pf: some ICMP types that also have icmp_id, pointed out by markus@ ok henning markus Approved by: so Security: FreeBSD-SA-24:05.pf Security: CVE-2024-6640 MFC after: 1 day Obtained From: OpenBSD, mcbride 8c0632cd274b Sponsored by: Rubicon Communications, LLC ("Netgate") (cherry picked from commit e296b0de9e467b8c5eb853f6cf4c6ea28d4119a2) --- sys/netpfil/pf/pf.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c index 1bdc695f698c..b0ef27b2e462 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -1720,21 +1720,21 @@ pf_icmp_mapping(struct pf_pdesc *pd, u_int8_t type, *icmp_dir = PF_IN; case ICMP_TSTAMPREPLY: *icmptype = ICMP_TSTAMP; - *icmpid = 0; /* Time is not a secret. */ + *icmpid = pd->hdr.icmp.icmp_id; break; case ICMP_IREQ: *icmp_dir = PF_IN; case ICMP_IREQREPLY: *icmptype = ICMP_IREQ; - *icmpid = 0; /* Nothing sane to match on! */ + *icmpid = pd->hdr.icmp.icmp_id; break; case ICMP_MASKREQ: *icmp_dir = PF_IN; case ICMP_MASKREPLY: *icmptype = ICMP_MASKREQ; - *icmpid = 0; /* Nothing sane to match on! */ + *icmpid = pd->hdr.icmp.icmp_id; break; case ICMP_IPV6_WHEREAREYOU: