From nobody Mon Dec 1 21:31:20 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 4dKxt04J9qz6Hhyx for ; Mon, 01 Dec 2025 21:31:20 +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 4dKxt03KjVz3H4M for ; Mon, 01 Dec 2025 21:31:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764624680; 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=f7yYwbrkUJXNkhf77Rbo3scshvwWZnyS5s8oVsE39QY=; b=C5foKIOR7YbiXrpQYmyVf37KaSV+S+KOtvgYkAkocIfTr1aHNF/Pkc+koqY6oDyBtqHokO 0d5Iz0SwkDB58wJuSpAxphykTGjfVeKG6ofyRuv6uJMLQu4IfWz4U1crqi8RJo1sNPrRZ6 d+JmqHZD5bMhF+520WTFljLUQyLXquAjLPpuaBxBFa5rYK5oKLkVJA86KiCO2/U4oCgCWc v4kF6ZBOjhCdacd78BfXZV2oOhcHP0a6qk+vwqa3SHBWxOZI8gkjv7JGbgKFVijl7U+tNy ItIvipmkkBf4Y8TNUaF6SnmGfLMzVHDDsDdK8s5IuOB6eUJwFxM4g3y9il+aag== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764624680; 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=f7yYwbrkUJXNkhf77Rbo3scshvwWZnyS5s8oVsE39QY=; b=Oc4Pw0gQSVplNh4hsPXQTKLlWMc0Mb2u0KTwSix+fRoSGLohnSVbrAbA8U4hB3XdYNenXZ IKkYCtiGuyfjQxfRpJ91WrjO9TIn6y5dT1m3nMW8HRi6DHO3xbmgv/78SqVSPURri4rKNP K317kFWRsrrS3FGO7VQpxw4/bhKWIQVjGK3pJtTnGP8pA44t9j65BVf7a1TXBh/UNUWdvy ce/Ood752k4dGJJdW8tiVUW82Pc5QNqpfh+za/1eEmlfufTWE5AvIXHvAP3d2yyUZ7hTg/ 0lCzHvTR8MCM3Lk0klflvuyubMRC3kzusiRgy+Dkyrv3YTbf8ZWcw5gKVG9B1w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1764624680; a=rsa-sha256; cv=none; b=AksjuZrqoIALV65UZ1h079KOYYldKd/Mx9zJkuhuvslvUGtFdoxUX7ElCvsj0Y03TWvdcP sF9R1ht9E/QNcJr4fGZVQ6FxPGLosPdmqIUQy3XrCsqOoUAcNdezmUOM2LCn3yBMrL0jox lf8TFSYXxUDGqKytzprKOm/EB5Zdk+GPVgnwc+tX8QPkm3lxSha+NxjxUtod2mV05JbOf9 mniDVhgifA/F8AvyKFeyAc93O9lNyX6NTbJsNDzdZOaY1CQKtp7jLDRS0004xRmFsQgzVx ELkt1cgGh9IsG1MyucysmuTDIBJ+wDkCDPTcRU7FTJi5hXtVQdk2rgB4+Z8RhA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dKxt02cl8zdpp for ; Mon, 01 Dec 2025 21:31:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 365ed by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 01 Dec 2025 21:31:20 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: d6f1acf94d3a - main - pf: use correct sized variables in pf_change_icmp() 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: d6f1acf94d3a1b310318ea3ff6c4f4b33bc8e85d Auto-Submitted: auto-generated Date: Mon, 01 Dec 2025 21:31:20 +0000 Message-Id: <692e0928.365ed.2ee91c72@gitrepo.freebsd.org> The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=d6f1acf94d3a1b310318ea3ff6c4f4b33bc8e85d commit d6f1acf94d3a1b310318ea3ff6c4f4b33bc8e85d Author: Kristof Provost AuthorDate: 2025-12-01 10:06:24 +0000 Commit: Kristof Provost CommitDate: 2025-12-01 21:30:21 +0000 pf: use correct sized variables in pf_change_icmp() We're updating 16-bits checksums here, so should use a 16-bit integer, not a 32-bit one. No functional change. Sponsored by: Rubicon Communications, LLC ("Netgate") --- sys/netpfil/pf/pf.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c index 74d2182fe77b..2f09d47dc6e1 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -3531,7 +3531,7 @@ pf_change_icmp(struct pf_addr *ia, u_int16_t *ip, struct pf_addr *oa, /* Change inner protocol port, fix inner protocol checksum. */ if (ip != NULL) { u_int16_t oip = *ip; - u_int32_t opc; + u_int16_t opc; if (pc != NULL) opc = *pc; @@ -3547,7 +3547,7 @@ pf_change_icmp(struct pf_addr *ia, u_int16_t *ip, struct pf_addr *oa, switch (af) { #ifdef INET case AF_INET: { - u_int32_t oh2c = *h2c; + u_int16_t oh2c = *h2c; *h2c = pf_cksum_fixup(pf_cksum_fixup(*h2c, oia.addr16[0], ia->addr16[0], 0),