From nobody Wed Aug 07 13:44:23 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 4WfBHC6sWbz5S9Lp; Wed, 07 Aug 2024 13:44:23 +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 4WfBHC4zBFz4hjG; Wed, 7 Aug 2024 13:44:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1723038263; 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=4Hj/Mz6Gf4oOw9OPqEtJhV/sjTGThYOjpADtP976GI0=; b=vyvVwdl2t5fS2j+bdtMorKaGDpZgVgsCM3on1c37LJyYWCXg8Nz0EilIhNHrspiR0jUm/x xmIjt03+49d5nnXiph4YfhqUS2uvy+EzOWZFx3ak9EkngIZj7HWcBT7DQXiQo9cHOhrI2W q/jpev1XAJBFGBbjB2nZj3OmG0dFrdGemDwKs6hyj0podwKRNaYWcvv3r33N3eeqEoomt/ RoZIqJ3Zh14Uw6LE7NK3FBkJUyvsAbnlgkY0OsuwQP2d5/ngZ0yN8NWhn5sHvbekQZrSjo BhyeWzOeZJ1yR35llGwn2l9hcPCOYOpzDLF5BpeaHhD0WXXT1YxoALfPdD2S6A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1723038263; a=rsa-sha256; cv=none; b=vuXDuHDSzUUN+95KIT5psIfiD8PwvoP9+xKZJIvHM+Cu/zTI84WpIRSRTWc0rAwGyYBK3B Q+QiFmADB5jqs3/UhW/5LRDmEjGY0JMz6talHFUxawNLSUUOpC7j/8wsw+3+4Qq2sdica+ JfgOAkgSCpXtmOJyYuncdGBOfMDdJzFPLM09Yj6+ZvhmndyBPPWL1a56Kxjiwo1K7sAdcy 9x1oNJnn7BWM9PK7cFeCUdhAzKEMR4fPkDHtFHWcvSCFuqhfsP1HAEbdI48Pax0+gaGbVF sM8f2ItxtmmM5Ae+tO20fZTtNdfYAVEXA09dSMn6DPgCcX+6kj5+1jZ0KDFAyA== 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=1723038263; 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=4Hj/Mz6Gf4oOw9OPqEtJhV/sjTGThYOjpADtP976GI0=; b=SsiDNwvoXHKL0YT3GnSbf7URtdvDbt9lBmxhDi32gv14zrqsMFKk0iGMezF3omgirkN9KX jFGaQsThs2FDP0hmtZE+4gcIchd3IKkOBix2WrE0tl3w1eWrDNshUMp9iTV3cy38PyXxfb Sj3htKA0i/SGwgPyLPKyjwE4VfLql4W0uzLMxR3aWwk3LeICq0wbrQFZWpj8zPjAqdYMzd vEnMTz6g4cMOb7QS60YUt132CcgPgtWMSGpttCtPUu8NvXWe/I8YfNoMFGvpZlIMExuN6X tEF/KJMZbcSQIWu3iVyX4Z0mudasahcltlq8ugsUp9kTxSpdKKJPgghj+p80HA== 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 4WfBHC4NClzsmM; Wed, 7 Aug 2024 13:44:23 +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 477DiNq7033477; Wed, 7 Aug 2024 13:44:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 477DiNMS033474; Wed, 7 Aug 2024 13:44:23 GMT (envelope-from git) Date: Wed, 7 Aug 2024 13:44:23 GMT Message-Id: <202408071344.477DiNMS033474@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: c95f99c0abb3 - releng/14.1 - 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/14.1 X-Git-Reftype: branch X-Git-Commit: c95f99c0abb31b4d68f9672aa85a8e248a159f6f Auto-Submitted: auto-generated The branch releng/14.1 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=c95f99c0abb31b4d68f9672aa85a8e248a159f6f commit c95f99c0abb31b4d68f9672aa85a8e248a159f6f Author: Kristof Provost AuthorDate: 2024-07-10 11:32:03 +0000 Commit: Mark Johnston CommitDate: 2024-08-07 13:32:00 +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) (cherry picked from commit c5081b8d3918564c1aba5a5e3f0a5219568e3435) --- 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 3212a1443f63..b4c310796cf4 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -1766,21 +1766,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: