From nobody Tue Dec 17 10:07:59 2024 X-Original-To: dev-commits-src-main@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 4YCCDc52NVz5h0wM; Tue, 17 Dec 2024 10:08:00 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YCCDc2qlSz49mr; Tue, 17 Dec 2024 10:08:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734430080; 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=59RipIwNBlKHsntLR+x2JR/iCnthlaiTEkaWri53C/g=; b=i+ktdIQz3dqWIZEunrUMJf6Wtfc1Y34xrhzFippEwGIOLjRBLeIwegLbw+U7cjvrc6kUQ2 dERbPBYxnqFZ580376Rvj2ftElJrWQRMnWSONsmRF9XDmiceXiwufYMuoTWKxbcn6CaXR2 S9O9cO2kI7FJxsZmmOURzkzJUCkDMrqqMGpvMQxAiML9Pt83PyhAwKzsSFPMver2HwrZE6 16O/PnfUzKP6I7qkrPlaf0leYU3GecYLDn5wQhBZ5rK1lq9qc0BA8MwrQ+WxJlJj8w7wsz sy60Epmc2jreYoC2BIc761gW+UQH97K1YxSNCgPwiN91zmhGbo4EbXLheS8fqw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734430080; 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=59RipIwNBlKHsntLR+x2JR/iCnthlaiTEkaWri53C/g=; b=dPSHG0+KUYky6kh3QUielrmBSJKQZIiVfAzgKOl0eKhLDzA3C7KZB2DVKbvXMJqu6kn36s T1SlXKxcL1hiiqfqqSI+goOHXn6AVEl1OGqnrhMFoe4hDbcX5auEnEjg2Ft0laqRLgTFMf x8VqaPlh1f3/bN41jY8UtnPofR/FPWYW31ZAKdmS731v0MB2c2Oo4WUjqdoEQzFqo6ux8J 6Lu2so3nztkSiyrWS5m5Wa7UoLrSsaebf3xepoVO8HlFksClRLIDsUhGM01EVYF/21++mY 7ABHU8Va9jmmBrA+0tWkacrqzpvBXxNMENUa+zfzbmcnjST3LT1Ve3bDvk1R5w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734430080; a=rsa-sha256; cv=none; b=fXE+QJOSSbNH2JCUIQlNwRKcRYC7H1A/74bDA+lok68mFA3mzzwXyTecrw4iMeZrH3zN/K RkkJGzRc9edYCHV7efdV3j8e4K9y3/SWtNUOrghYuQWsywQYsGt9awTxLBF9y+I5o9Wy/9 w8JjwfHu9k07BLeSshwAws9Ww3E203aelCdA7fcrG6WQTt2q5pJnDgjPbu3xDi48MQ3Xg6 RR6ZWW6ZbADEsjHwxZ0+7aAUZBl50gz6BekE+WkboC9iMfr5isOxpNOCAEHnnyYHx+kQNm brCesvGprtyIFnp8qAMxL+JUpgNf6kGkfW1FiN89dbaBUdVbq9F7uUCkrvuYRw== 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 4YCCDc0nJNzJvh; Tue, 17 Dec 2024 10:08:00 +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 4BHA80LH024224; Tue, 17 Dec 2024 10:08:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BHA7xPm024220; Tue, 17 Dec 2024 10:07:59 GMT (envelope-from git) Date: Tue, 17 Dec 2024 10:07:59 GMT Message-Id: <202412171007.4BHA7xPm024220@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: f1ddd7f1dae6 - main - pf: add forgotten fixup for icmp6 id's when translating List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: f1ddd7f1dae6fa3cab8c5044e3b4f719bf93ec97 Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=f1ddd7f1dae6fa3cab8c5044e3b4f719bf93ec97 commit f1ddd7f1dae6fa3cab8c5044e3b4f719bf93ec97 Author: Kristof Provost AuthorDate: 2024-11-12 10:51:33 +0000 Commit: Kristof Provost CommitDate: 2024-12-17 10:07:15 +0000 pf: add forgotten fixup for icmp6 id's when translating ok henning Obtained from: OpenBSD, mikeb , 7dde5f4db5 Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D47799 --- sys/netpfil/pf/pf.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c index 4c1111c6106a..445aef881fe8 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -7815,6 +7815,10 @@ pf_test_state_icmp(struct pf_kstate **state, struct pf_pdesc *pd, &pd->hdr.icmp6.icmp6_cksum, &nk->addr[didx], 0); + if (nk->port[iidx] != pd->hdr.icmp6.icmp6_id) + pd->hdr.icmp6.icmp6_id = + nk->port[iidx]; + m_copyback(pd->m, pd->off, sizeof(struct icmp6_hdr), (caddr_t )&pd->hdr.icmp6); break;