From nobody Thu Jul 2 09:34:53 2026 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 4grWv12lD2z6kP7h for ; Thu, 02 Jul 2026 09:34: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 4grWv127gtz3Kq2 for ; Thu, 02 Jul 2026 09:34:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782984893; 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=fC/RYjpVF9hCAKviZb2lPR/GhKvwSh5WsrHkaxcN1Yc=; b=pG99CHcnE9stMKnfmOp/yUkbU+WpLK0kFkyFckLZll8SxIQzjP8qfMC5PtBUkJbg23Etxr JOmTNHzavzNddzyuZ4EANtnPoJ+nI7sJE8NwTutXiwoCA3zjL5uOzHE16tkZhMnol5LJFB 4pfsWQjxVFXiGVnXE29tyXZVsoQypJoaTOdjR1hoaLjzTUQsEVskI+R7mlf13l3AH4vReS Qn0tj5xkvLHWgwKKVratr4I8+3m3wors3cBOLLY3gOL9qrCxaOw9Khah8ktVL93FroUkOg XygFC8IhuY6H91SdvX2fiHYCDO0vsPhnpJCkptrUOGCQRF64uFw12BlLK7jVog== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782984893; a=rsa-sha256; cv=none; b=VcWwzRmBaIElfVz6kF21mQ8z465T6yr7X7n6TjdGhoZ+NxtAKf2xOjLVewIg/ezvPG5a9K Bbx//GT1sVqLAH0yYfcpGLw0dxyrxzt6pd2+vX6jsLGxbGSmkeecrCfGjEish/UXaSDCxJ zz+IkMun3nO7yK+DNLGKL07X3jU3LyLKbsoAqpOedbVaS8+qcFuRWi/QMHgP5RwYAENSCh k7nAnX/q9FwMlXTZLFZl6apjB5TUBhfy29btw2EzDT5x/42P1f+Hkw8ZGVwG9WXcUhKjG2 LEnOdzsnpxw8ms+xsPe8AvoCZ7e3vgVJp4SYalhNTAFjjOp+v77B7BPviOHf0Q== 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=1782984893; 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=fC/RYjpVF9hCAKviZb2lPR/GhKvwSh5WsrHkaxcN1Yc=; b=a3DIN5UPJPDwvxQtOqn9j8laWpk/qgrtdMIGJcZzE0oQiDyuypWcwmezW60lrBxEtPtpvE D8ocwXqeStlhJtpK4sf47Lx+7s2+NXtyIRgGaq6Xohj/+A0O0Qla9Uw1i+Y8RsjkMPeap8 t9YauVF7swHqtohENbL9Ty8fOMXJI31F9DA4EcyATUOd2FKXkiqYt4TQ/o1j6tqCCtLE2r dAx/VCxezCTb132ju8rTMkZymp0MezWSIhhy8/4fs24MZOqAFLVaaOMdD5TmJ6/FIwPyMv 6PHKp3/5Gw2xoCUq+FvB/w3aELupU8KfHI7GfuhXj8QWLQfecmlmrYjWUt0++Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4grWv10pD8zw53 for ; Thu, 02 Jul 2026 09:34:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3cfec by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 02 Jul 2026 09:34:53 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Tuexen Subject: git: fbc039e512c3 - main - tests: fix checksum computation 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 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/main X-Git-Reftype: branch X-Git-Commit: fbc039e512c3bb1635ad20cc8f70ad608ea818b7 Auto-Submitted: auto-generated Date: Thu, 02 Jul 2026 09:34:53 +0000 Message-Id: <6a4630bd.3cfec.2ce5667c@gitrepo.freebsd.org> The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=fbc039e512c3bb1635ad20cc8f70ad608ea818b7 commit fbc039e512c3bb1635ad20cc8f70ad608ea818b7 Author: Michael Tuexen AuthorDate: 2026-07-01 16:07:04 +0000 Commit: Michael Tuexen CommitDate: 2026-07-01 16:07:04 +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 MFC after: 1 week Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D57988 --- 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 *