From nobody Wed Jul 31 07:41:09 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 4WYkYK5yKcz5RNry; Wed, 31 Jul 2024 07:41:09 +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 4WYkYK4zdQz4qS7; Wed, 31 Jul 2024 07:41:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1722411669; 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=bhJI3T5i+lZ54Fwl0ALkMvnLbaPdnnkRk5liwAD1SrU=; b=cowkfcTxP1iWck2T39C/YcejeyWV84vjhWoMEodoiol/sDy5YXy3QBuXvT0ZifN2BhPhex vjkCL+/qhiC9GpsLgjMdXCVnlj+xXjlC6dUbI8ts81riHF5ad7J+aoS2TLQ/c1E3+3c9gf IWPCt/D6C8tT2/eRN8ZCJBZN+oGTdhVwbwKZZhtWqi8+sMvGhRzkOWdm62QKWncwtwp5T2 +S3r6KJ/j0wxHiXkwxFxxOMH9L9U6gS1yXixDeI+URzpjEaQLgcPFh4Tq548GB5WCt/E9r Uxas4zjaFsUDrnQyT9Y9blMZ/beuS0+oEXPfV2T6CAgvRsoiXn+IdEAnQOYKCg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1722411669; a=rsa-sha256; cv=none; b=a+o8hwvcvxcqv7behUr4GTReKT5e5gFpnYdvSBAeZeH8DgurvO137BlFs/DWvS+UjOGE9+ EvYSsYm6aMvRDpAF78f72C1tIPr0v6zWfl/SpKLmRX5jZ8RCLOFBfssgyHkNgHa/TvJazY A2UF1qUNhvb4vdN87k2kwi00D6xdMYSxUDV+ydSpNeZBJDdrXwjtzg7gxmO+R8LgUEQvp0 ibmE/CUCbhOe57bHcjhMns5kMpFkYoFa8ayLo5ZCTUdp3I2v93Epa+A/08VRvSt55nJfcW vHgoVPHz256TwVSWTSGBWvxovSnY8B59rcPleAC781fQALuV/Kstv0N4mQqXGw== 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=1722411669; 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=bhJI3T5i+lZ54Fwl0ALkMvnLbaPdnnkRk5liwAD1SrU=; b=RjR0xU1+utmvCJ5JJ+R2X9g/pWb1WMjq6mAeHqitzgnF/ex1CVhHqeKxueDwWZXqGmcXHP jpkbrutCbbYf6muzHxkdGPQwJLBoqlmfugeIYLxggk+QRYxUbmUHYyiRqqNeot10+r0zBc NVr6mFUn2Dxo57HXvxwxctniyMCYEYHuTkyru5cK7dygSmxpBFyDoX6wlNMAFbRBtOasgd om61hcUyDflmtgjGUygViF3eYkIh9Nv2kBdCPIRgRSWMPuZtppmEDbOpXOHScUCKrOdNm4 aNlNWb6/VHeLPPOAqTXhcS80CwadvL45sh96snU6lpAZeYR5u2fNlQblAvj13A== 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 4WYkYK4bBFzsNg; Wed, 31 Jul 2024 07:41:09 +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 46V7f9of084544; Wed, 31 Jul 2024 07:41:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 46V7f9TZ084541; Wed, 31 Jul 2024 07:41:09 GMT (envelope-from git) Date: Wed, 31 Jul 2024 07:41:09 GMT Message-Id: <202407310741.46V7f9TZ084541@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: c5081b8d3918 - stable/14 - 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: kp X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: c5081b8d3918564c1aba5a5e3f0a5219568e3435 Auto-Submitted: auto-generated The branch stable/14 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=c5081b8d3918564c1aba5a5e3f0a5219568e3435 commit c5081b8d3918564c1aba5a5e3f0a5219568e3435 Author: Kristof Provost AuthorDate: 2024-07-10 11:32:03 +0000 Commit: Kristof Provost CommitDate: 2024-07-31 07:39:53 +0000 pf: some ICMP types that also have icmp_id, pointed out by markus@ ok henning markus 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 b3c4d47cabc2..e74a385d0f72 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -1777,21 +1777,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: