From nobody Thu Mar 20 02:53:18 2025 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 4ZJ9B740T8z5r8X6; Thu, 20 Mar 2025 02:53:19 +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 4ZJ9B64kVYz3c8X; Thu, 20 Mar 2025 02:53:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742439198; 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=NaFn5vTJDW8//6i2TUhoGMIvDUZo3U1nKv2xzKQo7ME=; b=ikWz/kfraJlIW/7Q2ifuWxSJcYqSobW0DzRNqgcauftSDV0AI49b7btfKSva8VHJQYguyq 4WL+UvcFDbKsiNSJ6S8EP3eJspV1vUmgGAZCzvPIzPBs/CRoKq/k9dPZoKv7QWrcdBMhkg rzUgdRMCy0l6uAPfD8ILty23nsKaHSg1XzOQt/98srx6LbJhlwF+6+bByNtlAxkSIG51d9 +fnYMp5/N44M14tB+W/VW9gs9H5/WbHoB+49o80LGGtRf+4YADEAqe4MmP1JEz04R1J4O4 6ezuDSKYZ66kgkq1kFw3AGdV+V+871o0rU0bDT8QLydvZLXhq0nGVzyZVOCOHA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742439198; a=rsa-sha256; cv=none; b=HhYePln3vbW8LiQALDobdyVbOXRoq97jGinr7M9018z/ILLontSedG93iSEcXGAj0fxf5F PSu5jy4WoegDJVmrmOwBJh7GoX9Akpk8Xr6DmgSQ2KRpBdQcy/G52Q3CKVpZQHNYbsgMKJ QZJOz0WfNBypWoxSHC8Kzl/vQb7r+LQxAeMPrLL1S/9ArLKMHrprFziU6jvBxleC1p8Drs vgpKplIpIre/BZpW0LU56LG0n/bnJ6/iya3+S9y34Xj45bGD7UanICwUzgOQ8mTZpQlrBJ aRl1a6sSSrrQPt9iVXPtxtb3Ef49Ln61HVSvvjE+j1GqjrwzBnXt3ucTc1jD3g== 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=1742439198; 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=NaFn5vTJDW8//6i2TUhoGMIvDUZo3U1nKv2xzKQo7ME=; b=yUYQy83wSxP3L8etCZnqlhp9jUQsukhiICm7EVAQ/UQzOdsNlMS6UvHZEuYvTocGJQq/xC lsXLG1wPLk85tudece/3o4KaHaSrrEJEXxs5lqM+mJN8avnCOKLwgr9sn0aF9AuuXzZSEC fu1V26D4T11NRi6Q+ccRnKM86VYFQPKTjeRTW025915I+9FDArmLGU3yYW0S8aZjKpYw7f BAvyn1vcnoHok45HKJuy3n1+vza+o075cfcsCaKdqB91gST1Mg+0K6sRQEr0csk+opR5K8 0qbhss6lO7wRWjI/o4EB4cgyIrl/M3fjqKbKDfxUP2DiVMiCTI8jFYsj45YEKg== 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 4ZJ9B64L3vznCR; Thu, 20 Mar 2025 02:53:18 +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 52K2rI06046573; Thu, 20 Mar 2025 02:53:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52K2rIOb046570; Thu, 20 Mar 2025 02:53:18 GMT (envelope-from git) Date: Thu, 20 Mar 2025 02:53:18 GMT Message-Id: <202503200253.52K2rIOb046570@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: cf6a7804699f - main - pf: Update a dummy TCP checksum field in pf_test_state_icmp() 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cf6a7804699fee8931af7d5c36b1fddb19d700eb Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=cf6a7804699fee8931af7d5c36b1fddb19d700eb commit cf6a7804699fee8931af7d5c36b1fddb19d700eb Author: Mark Johnston AuthorDate: 2025-03-20 01:34:38 +0000 Commit: Mark Johnston CommitDate: 2025-03-20 02:52:42 +0000 pf: Update a dummy TCP checksum field in pf_test_state_icmp() Otherwise the parameter &th.th_sum passed to pf_change_ap() points to uninitialized memory, since the portion of the TCP header that we copy from the embedded packet doesn't include the initial checksum. This is harmless but triggers a KMSAN violation. Use a dummy variable instead, initialized to zero, to fix the violation and make it clear to the reader that the value isn't used. Reviewed by: kp MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D49347 --- sys/netpfil/pf/pf.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c index 3bf7e0e2077c..dadb3299ff99 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -7905,6 +7905,7 @@ pf_test_state_icmp(struct pf_kstate **state, struct pf_pdesc *pd, struct tcphdr th; u_int32_t seq; struct pf_state_peer *src, *dst; + u_int16_t dummy_cksum = 0; u_int8_t dws; int copyback = 0; @@ -8026,10 +8027,10 @@ pf_test_state_icmp(struct pf_kstate **state, struct pf_pdesc *pd, nk->af)) return (PF_DROP); pf_change_ap(pd->m, pd2.src, &th.th_sport, - pd->ip_sum, &th.th_sum, &nk->addr[pd2.sidx], + pd->ip_sum, &dummy_cksum, &nk->addr[pd2.sidx], nk->port[sidx], 1, pd->af, nk->af); pf_change_ap(pd->m, pd2.dst, &th.th_dport, - pd->ip_sum, &th.th_sum, &nk->addr[pd2.didx], + pd->ip_sum, &dummy_cksum, &nk->addr[pd2.didx], nk->port[didx], 1, pd->af, nk->af); m_copyback(pd2.m, pd2.off, 8, (c_caddr_t)&th); PF_ACPY(&pd->nsaddr, &nk->addr[pd2.sidx],