From nobody Tue Sep 2 21:10:55 2025 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 4cGdgz55pWz65Rwd; Tue, 02 Sep 2025 21:10:55 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cGdgz2p2Rz4279; Tue, 02 Sep 2025 21:10:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756847455; 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=v3Pfowo8DQz8/yY7oVj2Jnd0qAfEqjtimr7uyOmBruA=; b=IN7y6Amwn9C0Vdu4UoeGlOOX46w4jU+0B5dD9GCWPUsFdGqXlhMn33A3FZhlcT90IT8DaO JgL+8uCQemqmPzv2hlyHlPqQn/sFU86ZGtPvgzK2qzTmtM/In6h35PRdh0KcyRe4Lfebe4 XN+xYwcSGRqQFvdKB8EpBqqwhJPeyUkYi7LRQlrE711xTlng3cmZxdGEqWQks/lbG64DZ/ TLtwlUoX4dx5bwnklzHl5Igz+/FF67z8e4JyGdZgI+4AvLxX3nF4JZ4I0r0YlFCZiK0CKE psk2wW78k35MMcHuziAmVZfBnWwEcmLz0K/HvbNhKleLVCf2IPu0tKaSY2Y/lg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756847455; 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=v3Pfowo8DQz8/yY7oVj2Jnd0qAfEqjtimr7uyOmBruA=; b=HOw4oovTJnPcyTqHLPQtFnR4sKxs6S7cLdMYtuJX1HaU43zTJQDnJPC/h7NA1bpskxP5qV NgfLAnJxn6Ip3rAzV4roYeK5I2qiFX5nZkfN4WG54jPulVzyh4Q9LrGAJTjP9DNJlz/p0e ARrN/IRT8mYpeYXJykpIVfgGVrrkj220bOG/Gi6SYiw+q02wSNqFwIFywNdmBwXNTs7SDQ VpwVZ/Vi57NQSLIeRo9vJT9eU1Jff0OhC4V6yWwb7jykRwVIOFNJdtCfTD4EIgftmAC4sc /beAsyOaJHMDmyUZXnkacYYxNH7pW33zgiv7NDxCPIf5sgT+H5cvBy7BwFv5WA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1756847455; a=rsa-sha256; cv=none; b=pMljZfNoqK3taFKzJ+LA7KykcevmL8Ng9NOjfQ8kgcGyXQJo26uacqqYx/a7nXycN4nR3H n03xsHxZF6TQMWEYg7hs+QJSRyraFmOrhI45CUV3QzSmDcikGO+/K6J4moTwHNFJSELPLl 2lTal6NBrBPNsX86J0B/pVLmNQQWw4CnceY6Q2RJEml5vCeOhQyy8sSZBOGQfGaOi8Xr8z 5dXT12hsTgGmF6EDT1EvJdj7WWrfJvEvBUy7wZb0U1l46Ql4sw1u8IK0RgHEWwGa/yyrNB cUcKf9xBArdLdbdMN3nIvQpRLVywOTtoYfEmgiOjVdF39TyKN+k5mUix2hXwnw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cGdgz2Pvxz134k; Tue, 02 Sep 2025 21:10:55 +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 582LAtcW036518; Tue, 2 Sep 2025 21:10:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 582LAtHh036513; Tue, 2 Sep 2025 21:10:55 GMT (envelope-from git) Date: Tue, 2 Sep 2025 21:10:55 GMT Message-Id: <202509022110.582LAtHh036513@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: aa790af10a9a - main - pf(4) when doing af-to translation for ICMP protocol sends packets with TTL field to zero. To fix it function pf_test_state_icmp() must initialize ttl field in pf_pdesc structure for inner packet. 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: aa790af10a9a2ce36ca0b2bc445a01431b8bc0c4 Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=aa790af10a9a2ce36ca0b2bc445a01431b8bc0c4 commit aa790af10a9a2ce36ca0b2bc445a01431b8bc0c4 Author: Kristof Provost AuthorDate: 2025-08-25 08:01:49 +0000 Commit: Kristof Provost CommitDate: 2025-09-02 21:10:20 +0000 pf(4) when doing af-to translation for ICMP protocol sends packets with TTL field to zero. To fix it function pf_test_state_icmp() must initialize ttl field in pf_pdesc structure for inner packet. feedback from bluhm@ OK bluhm@ Obtained from: OpenBSD, sashan , 0d48c46cfe Sponsored by: Rubicon Communications, LLC ("Netgate") --- sys/netpfil/pf/pf.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c index e9b73827aa7d..d15a16c54f81 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -8048,6 +8048,7 @@ pf_test_state_icmp(struct pf_kstate **state, struct pf_pdesc *pd, return (PF_DROP); pd2.tot_len = ntohs(h2.ip_len); + pd2.ttl = h2.ip_ttl; pd2.src = (struct pf_addr *)&h2.ip_src; pd2.dst = (struct pf_addr *)&h2.ip_dst; pd2.ip_sum = &h2.ip_sum; @@ -8070,6 +8071,7 @@ pf_test_state_icmp(struct pf_kstate **state, struct pf_pdesc *pd, pd2.tot_len = ntohs(h2_6.ip6_plen) + sizeof(struct ip6_hdr); + pd2.ttl = h2_6.ip6_hlim; pd2.src = (struct pf_addr *)&h2_6.ip6_src; pd2.dst = (struct pf_addr *)&h2_6.ip6_dst; pd2.ip_sum = NULL;