From nobody Wed Jul 31 07:41:09 2024 X-Original-To: dev-commits-src-branches@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 4WYkYL2SJFz5RPLJ; Wed, 31 Jul 2024 07:41:10 +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 4WYkYL02RVz4qg0; Wed, 31 Jul 2024 07:41:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1722411670; 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=R/GjKuEnqtwHg3cZ4TkFi72QesW2Gzp3pyNpC2fnwN8=; b=fZhAdP1p5kryxN8oNVWcKUp8bES+I8vtW4v3v5LglIVOqIlkCefkScFQClCX5BhrMiogsv eSFNkINgHiooaXQ0Uj6/2YzdDENdOEWxse/t8vA0cOnioRh3jzUMMmNIDr6KnjxtZI6Ljo q1rwpd/OEpz73M0uJnwjN5iDJJjKV2Y1R6f/BrrA5Ht+Ystctt0Lrr9seUwTsv7dCy4urd 4lgMgEmN+MEM3gprzRcjRcecQvNpb2MxwL+bjPOtGbqXray3aOCx8wIDDvcN4SxJwBM/+n zH9BO3VuIsvIhvvlh4zQf5WUFZnkl/TEeZzEAlRtwVu4zmecBwmU6j+4zpaxJQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1722411670; a=rsa-sha256; cv=none; b=mbrq6T/tef7An6XvkTKH6RNT7Af/MXgJ82oXJkPKqFI+EYu/WlWoFVtqOOjg0oFnVARcIb X+iEwixdX6cQKCPaat1I+5RSEo24VwYm5fYdjukBDZB8HflPKg8ziyYFUgS0V1dfBzWZ1q KP6yNn9sMaapCPVsGSk/31V9lgF/QNNUEpEDJQ7gm9vKS+FU4TnH1M2vcicSUj+qvG6ftP SFLgKggUUOs2YFTq/6ofAvrsWQFWOGSrpCwIYYlldgin7Tid/c+t6H2zP+IDQb390LGn3x 4w8fHlgdN7OH9Jwz99b6R+TUt5LQBi9dSprFiEXqYXG9UfeHrm1oLa95ZLNqIg== 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=1722411670; 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=R/GjKuEnqtwHg3cZ4TkFi72QesW2Gzp3pyNpC2fnwN8=; b=snuwVQxAIoP7MwY+OGug48nt4sVYtaZ/hX5RCGg6ya9Q7MiPwZwKjj8DFAGmYF0ojtAThB pc4XqUKp//gi7XDYyOmcDCplUpQUD98EXDHwoUlbMRdrbPD9M13bnZkeXxMuOsxfM1jpj+ DmomEh4ag0xLWIwrVQEpVQYjND/9OLmdDkG+XxopLAFduEb22+G94XyWAC5aTnBVfUhdoz wP0mMh7k9rhjRFuAwE2KlwNJsOM9iwTXOm2LOMMmmzYnQAY/OowKV8nstVt1I1hoNnAp3w 2f3ChKEHIlr0CnEn3k5WF3NifPJMRorqB8OuTwcEOA0eusrdHEVE4+SkqX51qw== 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 4WYkYK6kGlzsF0; 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 46V7f9FY084608; 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 46V7f9Rv084605; Wed, 31 Jul 2024 07:41:09 GMT (envelope-from git) Date: Wed, 31 Jul 2024 07:41:09 GMT Message-Id: <202407310741.46V7f9Rv084605@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: 3cf0fe176e72 - stable/13 - pf: some ICMP types that also have icmp_id, pointed out by markus@ List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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/13 X-Git-Reftype: branch X-Git-Commit: 3cf0fe176e72a2c6cea6d4b8efd2a10a59c9a89a Auto-Submitted: auto-generated The branch stable/13 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=3cf0fe176e72a2c6cea6d4b8efd2a10a59c9a89a commit 3cf0fe176e72a2c6cea6d4b8efd2a10a59c9a89a Author: Kristof Provost AuthorDate: 2024-07-10 11:32:03 +0000 Commit: Kristof Provost CommitDate: 2024-07-31 07:39:34 +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 9f94da48a15f..66f27f7f45af 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -1730,21 +1730,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: