From nobody Thu Aug 6 09:06:53 2026 X-Original-To: dev-commits-src-branches@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 4hG1cY2gmlz6mgFC for ; Thu, 06 Aug 2026 09:06:53 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hG1cY1XZTz3Yfr for ; Thu, 06 Aug 2026 09:06:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1786007213; 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=J7R/VHyI/aosoQlsvQjAnLi7UtF/9/lE88tRlO9kze0=; b=qHfoME5qv9DuQ6Ua6u9iIziJT3++PWiYMidU7jrdgfj6xNqUxuosbihXzfJveoWXtHeLvz GN9dQ46eih6WscUShJf85pMOgqcDzwzkEO7euZk7Nk1CPYnMi15YYqhoac4MESDEqZXjfn 2BJceAaZDLAubrPjeZLv1BNld9B1M5bj4YzEzB8KDUvDyvuBMKPQ4q936vYfekQ+Xz7Aw8 uEDqOQv2F0EQwL+Tdorp7HM/nAUiQeGjNL1Grj7mYp8EyPBL0vKTNSyxx68DtgNAjVgdcQ Os3bFJkOh/8NvUOkyTdsvceyfPlaylzjDmREdqyZ1emdJAKdiCt2ivq10Kd+jA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1786007213; a=rsa-sha256; cv=none; b=FbBmIzI5YIphVZCOlh0T0EyUpZ3vjdNDe/m2G9ibxaT5EnlAcnwFGgZUs+siKiOT42/ETg u+TZD+3k3UKfxWSFRTNi5Db2gQKg5IyEc3VpOcL4KkyL8RiS9BP5I+YU410GQ9XW+p+ft8 OacL1oW10GfCLEr7ZAlsbiU4bPcz8JfTubs9jm8a1Kz8Tm74MqXQ4g3nvuVoImxwng1gNz kzLRz2Mn2rMQ2ol23p4VSMs/C7OpaTC83qwhbkyRfwKgY4sZmg2mC8UAqlzhP+Ph0mVda5 uYyuB60ihj/H3b2FKYhwGO35H6bw8SNImx7OVgsL3ix4MMzgKh7D5T9c44cyWA== 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=1786007213; 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=J7R/VHyI/aosoQlsvQjAnLi7UtF/9/lE88tRlO9kze0=; b=nryiRLYIyysp3GoIux0cxeZHxISYLzXFHapXS4opR38D3OafRr14fl15oGOtOmwk3+/VS5 BFoLJeDDKbuvWdpGBMEMgIaYkwWQbzX9jIqelMBkbJVKXnN5xVudkZP4mK64FU6NGsw68G 9G4k0wLPZdKcCPkGak6+zilj5Qo+xa40MvtttMVvnvwBM2PoEuqHRmVQ5qNUc83Ni9xe62 0/C1WkjbJr96MHfA6SqY5BHQ2Xuf8rrEo81EZIWegvhEKJEB+hSfZ2BZMR9pGaw4PWMCJX IAneV1qGLjLpuybyyKmCzt4uREJ7aW9M10e7JbrPip3EtrUVgRdX4l9dA6t3Aw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hG1cY06z0z1Cy3 for ; Thu, 06 Aug 2026 09:06:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 18894 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 06 Aug 2026 09:06:53 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: cad0d5772516 - stable/15 - tests: fix checksum computation List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: cad0d577251632bc9c7f808121ea9b0220474dbd Auto-Submitted: auto-generated Date: Thu, 06 Aug 2026 09:06:53 +0000 Message-Id: <6a744ead.18894.16f897b1@gitrepo.freebsd.org> The branch stable/15 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=cad0d577251632bc9c7f808121ea9b0220474dbd commit cad0d577251632bc9c7f808121ea9b0220474dbd Author: Michael Tuexen AuthorDate: 2026-07-01 16:07:04 +0000 Commit: Michael Tuexen CommitDate: 2026-08-06 09:05:08 +0000 tests: fix checksum computation This fixes an endianness bug in sys/netinet/ip_reass_test. Just use the code from RFC 1071. Reported by: glebius Reviewed by: glebius, Timo Völker Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D57988 (cherry picked from commit fbc039e512c3bb1635ad20cc8f70ad608ea818b7) --- tests/sys/netinet/ip_reass_test.c | 30 +++++++++++++++++------------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/tests/sys/netinet/ip_reass_test.c b/tests/sys/netinet/ip_reass_test.c index 538815bd7a2c..e32fb63f34da 100644 --- a/tests/sys/netinet/ip_reass_test.c +++ b/tests/sys/netinet/ip_reass_test.c @@ -55,24 +55,28 @@ struct lopacket { char payload[]; }; -static void -update_cksum(struct ip *ip) +static uint16_t +in_cksum(void *data, size_t len) { + uint16_t *cksump; size_t i; uint32_t cksum; - uint8_t *cksump; - uint16_t tmp; + ATF_REQUIRE(len % 2 == 0); + cksump = (uint16_t *)data; + cksum = 0; + for (i = 0; i < len / sizeof(uint16_t); i++) + cksum += *cksump++; + while ((cksum >> 16) != 0) + cksum = (cksum & 0xffff) + (cksum >> 16); + return ((uint16_t)~cksum); +} + +static void +update_cksum(struct ip *ip) +{ ip->ip_sum = 0; - cksump = (char *)ip; - for (cksum = 0, i = 0; i < sizeof(*ip) / sizeof(uint16_t); i++) { - tmp = *cksump++; - tmp = tmp << 8 | *cksump++; - cksum += ntohs(tmp); - } - cksum = (cksum >> 16) + (cksum & 0xffff); - cksum = ~(cksum + (cksum >> 16)); - ip->ip_sum = htons((uint16_t)cksum); + ip->ip_sum = in_cksum(ip, sizeof(struct ip)); } static struct lopacket *