From nobody Wed Aug 07 13:44:44 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 4WfBHc4bWPz5S97m; Wed, 07 Aug 2024 13:44:44 +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 4WfBHc2YCGz4jX9; Wed, 7 Aug 2024 13:44:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1723038284; 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=4lL2bGG+L2yqxUWFBvlg5JsF4q29JFzA20CW8M1a0LM=; b=gnm11WgzUndFJJ07CDFshI9fzGr5wgVqaHtVnJZjoYZWdMJZFQPjjKHpldqGF4/OZ2h/sI Y589kChuts+mFRMnZXKIPEua0WvKnZXhUpAJ/zmxEly50z3Bznz+5xgzBB6my3bNsKWIzE I72bVgR1PALVZFbjY+hgNodEOjUcIHZCzl06fW+dAg7oEPom2zxQukrbxA0AHwchxJMKJa 0GYl4oUoNzeSrJ34TjwIcaK1Il/GfKgnB0HZax+TVLvTW0po7IXr5WmjYH2SflEVcRIR4V UnMDTFTJVmMaW9/WGHwuh3944wZ2IiwNAgYVghEeT7YGjIAdI+Ie7jose2tYJA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1723038284; a=rsa-sha256; cv=none; b=x5x4RoNle1oq178hH3xL2YPBMA/8c9rhBv7ixOKs8Wor6l78LpDFm4iqGWRxZJMppvjOW/ vOCvWvLpjatQAeqXT6aZnPLc6+ibjTK/8qqVwGz+VP5V16F4qe0FFwIvYEGXdfH03+DbA6 awt6CbIfLiU2oIUU3+OYftTTf7/gxZGA6XBZiOa7lkqueK53iMAPrGqKIKqX0Z3ybm3fAk +iRmyKtpTZOHkbfLJTRM0iF837Si2r2/uTbD/celWmtrA7Q4n7PPv5ugVZTgyzszx5jlb2 y6//87nvrFGyZYb2JINyxoMPKJ8oDNQ31evIoZfZLg+vL8gqYBxYd4L8WVCYJQ== 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=1723038284; 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=4lL2bGG+L2yqxUWFBvlg5JsF4q29JFzA20CW8M1a0LM=; b=YNc6aiaBVgV4paJFRUNIwi/9TF9kvNNtNOn7Hfv+tdMPL8nHyQ9ijhRpEh8eo35QLH86VC IoyBztG++4lvbApglEgtQGL0bM2OTCXxvnBouzZcjlsGKnNv4MBkSDrfoJvL7TsL5j0QGW 8JH0jOPTlQSP1fLVXM5G525pAQhG1Pp9HMoSZ5+T96e6dtSrb2XcchF7YG/p8Jn/DmoNvl +iqje+Cp+KVEDZsOmOhaok4mNE6eDRFYTrWfPjCtfvyMlQeakG8DFd8dpxG4ZwZVHA0DNm jREWlu+NFgziFsAtPMY6v8pljlpAN8hq2lB0DOJiwpsrPj/VohZOa+EY5Wn74A== 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 4WfBHc24KSzspL; Wed, 7 Aug 2024 13:44:44 +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 477DiiQc034224; Wed, 7 Aug 2024 13:44:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 477DiiZL034221; Wed, 7 Aug 2024 13:44:44 GMT (envelope-from git) Date: Wed, 7 Aug 2024 13:44:44 GMT Message-Id: <202408071344.477DiiZL034221@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: 3151802d0316 - releng/14.0 - 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.0 X-Git-Reftype: branch X-Git-Commit: 3151802d03162e8d287eaaaa41e1d187f5acbc67 Auto-Submitted: auto-generated The branch releng/14.0 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=3151802d03162e8d287eaaaa41e1d187f5acbc67 commit 3151802d03162e8d287eaaaa41e1d187f5acbc67 Author: Kristof Provost AuthorDate: 2024-07-10 11:32:03 +0000 Commit: Mark Johnston CommitDate: 2024-08-07 13:31:30 +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 0491cd7369f5..71611acde2c7 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -1727,21 +1727,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: