From nobody Wed Feb 19 10:41:37 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 4YyXxs6gDdz5p9nx; Wed, 19 Feb 2025 10:41:37 +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 4YyXxs2zdsz3lRC; Wed, 19 Feb 2025 10:41:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739961697; 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=0Mb7sW3tefkKNVP3b4/GWAW+ZH8voM8se467WNDymvc=; b=DPBtJmPvfQF5qgQR6z4Ho/fC48tWvIt5oOCX0RYXvBlhhK0Dum2Fk9NCTOhpD/9/xOP7AR SFqeoOH8mFDUPye9b2piNJHzO9RLzJCf4GX3xnfkhRVlXxNTjCfGtbxh1EIeYumPd4gXyb wit+HEO8acA0mMDDM7Dy2S0ZNqfDSUHSg2LzPDFAv0WIIYMyNGcs3K8KD8PA86nzimiAef srCz5xtUjcif4Xfmxme+ygpcXEpT0vptSGYI1DlPhS4yWpzRGR8++2dgJKPNUWbNb5dFSa wVLSqV8KJjl9Q6zqFq4q7gkUXTWC86uyFpvC3mLLa6aDY8JVvBl8mK0go5paRw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739961697; a=rsa-sha256; cv=none; b=wFdMoSkAs0iH1uZLH5ouZdYwydEplh+7Buclksp0hEP+NMhJFBEbpzy+5QuxcMpktibOr/ q5lLK79g4HdEC/hf+J0ZDuBJ+6LhbwK35RXHoo18ICHybP4zaShmECibRgLOri9UgZCVjV YHfjbnPBgOEkpbilA7akLpm707nYGU4X/db5qcC2vk5ahV+ApR156NdE6/w5vMN5y4psPh EyByyvhK+Z1YU0WyU4RmaFCuWZ6/u/RN6EhO4mjPI7Q9XPuFLHNeW3nJpId16Wzfj80RgW pvPoh4rs7apeVwyBLUG0Re40jNntl9Js50Q8pkIR/x63m/hsB+PyibUefULQ/w== 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=1739961697; 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=0Mb7sW3tefkKNVP3b4/GWAW+ZH8voM8se467WNDymvc=; b=NvhUdVDMFjFXCGsi5Dg/RmuoQw1fgikiB+Z11YTqDPKV5pWhHRpovLiI2p4T4Vj2+LWfD2 z1TILDaCy7uakZiBRl7gTRdAa0RcjBymaO9AjE+X1i6l6jLT/ZSFWQA1de6iDmT0EHDdPB H1PDVHImDH0A7ChGXsLUUfBPm4/4WNTkasZygVk3hVf6A4LGCT4CqsncDcbK6a+yxQgzAz RBO5KwFvB1i+0xZW6KgimYvsTAx+whL+lR3p0r/ipJYbaLl3LF/FoIDM7mrGyFVt9t8X0R cZGZKWpgdfMhccwSkW7eIpHrj0hd+cgZQjkFbAEjmJSClVN733GscIRosk4qVQ== 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 4YyXxs2N4Bz12mb; Wed, 19 Feb 2025 10:41:37 +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 51JAfbfS035297; Wed, 19 Feb 2025 10:41:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51JAfbCJ035294; Wed, 19 Feb 2025 10:41:37 GMT (envelope-from git) Date: Wed, 19 Feb 2025 10:41:37 GMT Message-Id: <202502191041.51JAfbCJ035294@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: b34f497b3e6e - main - pf: simplify pf_check_proto_cksum() 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: b34f497b3e6eff1c7b12f5700d897743073dfcff Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=b34f497b3e6eff1c7b12f5700d897743073dfcff commit b34f497b3e6eff1c7b12f5700d897743073dfcff Author: Kristof Provost AuthorDate: 2025-02-11 13:24:56 +0000 Commit: Kristof Provost CommitDate: 2025-02-19 10:41:09 +0000 pf: simplify pf_check_proto_cksum() Simplify and shorten the way ICMP checksums are verified in pf_check_proto_cksum() by letting it use the same in4_cksum() call that is used for TCP and UDP checksums. ok henning@ naddy@ Obtained from: OpenBSD, lteo , 3c23016fb7 Sponsored by: Rubicon Communications, LLC ("Netgate") --- sys/netpfil/pf/pf.c | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c index ea5687407881..da741364d372 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -9276,19 +9276,9 @@ pf_check_proto_cksum(struct mbuf *m, int off, int len, u_int8_t p, sa_family_t a if (!hw_assist) { switch (af) { case AF_INET: - if (p == IPPROTO_ICMP) { - if (m->m_len < off) - return (1); - m->m_data += off; - m->m_len -= off; - sum = in_cksum(m, len); - m->m_data -= off; - m->m_len += off; - } else { - if (m->m_len < sizeof(struct ip)) - return (1); - sum = in4_cksum(m, p, off, len); - } + if (m->m_len < sizeof(struct ip)) + return (1); + sum = in4_cksum(m, (p == IPPROTO_ICMP ? 0 : p), off, len); break; #ifdef INET6 case AF_INET6: