From nobody Tue Dec 28 09:24:37 2021 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 02179191FE54; Tue, 28 Dec 2021 09:24:38 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JNTdK5K2bz3H7l; Tue, 28 Dec 2021 09:24:37 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 937396E2B; Tue, 28 Dec 2021 09:24:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1BS9ObBp075044; Tue, 28 Dec 2021 09:24:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BS9Obi7075043; Tue, 28 Dec 2021 09:24:37 GMT (envelope-from git) Date: Tue, 28 Dec 2021 09:24:37 GMT Message-Id: <202112280924.1BS9Obi7075043@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Tuexen Subject: git: a7ba00a438a6 - main - sctp: minor improvements in sctp_get_frag_point MFC after: 3 days 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org 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: a7ba00a438a64b34219f2990b3f7348126f7b4ab Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1640683477; 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=b8vxV1a1sCuiY7VRJiP5nqYv69O4XqS2ZgOqEdS7mjw=; b=vWdXPHGJhdJ2AUS4WHAHze8TCImPrafxyzdb2tiZtqU27JXcWpXsrAgb5j0pRi4YMnOXVw rfbdmSxf0kg2k/TlFn2+1QL6rs+FXKw1yUAbgbl+7RIQGUpb4cD/l434CgsMkoXg0ou5IL UV0Wg6gklWb/dAaNctvXKzJsioG5j4SPsfvu6xQ/lKG+EUptTtmR44BCd5Drv66G/Y14ly roe10n73nnke5prcMnRtocz1ReQ3u1jxl3joX/PxAGi+Xl1ltR8cD+wSaznoTUcWTJzfgw kMnPcz7Cq2vnV7p4sTY5u81h8v89Bg9FsRm1pw7bOGHq2tIkCT+ZPfdfDPnyVQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1640683477; a=rsa-sha256; cv=none; b=mvZq4EBEDbdezeVQi5Cj/byJjeMiGpD44VclqAba6aJhTjvUwZaxP48AYh/nRWvVQggdTP RKyJKNvdZonvQUDxu4Emb6gLKRyP58M0/BUDpgzcdgONBc0e2O6FHbly5EBeHPZv5NmMhm gV6tN148YPNTdQtLIAUrYDb3fCE+4v+xq4cLASYJwHAeG6gU28igaO646eGiebCXc9DGtm TgwVo35aOaVvu6mh9F+00CLKay39TkdZixul/irid76K+RQ+psZr4xC297UshUQkigLOTr 5uS5loy25RsKAsSV3VGZuP0qph4WcGeRsQ7a6rYQ/JSmyfQd2HKr4Ut2wyDUUw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=a7ba00a438a64b34219f2990b3f7348126f7b4ab commit a7ba00a438a64b34219f2990b3f7348126f7b4ab Author: Michael Tuexen AuthorDate: 2021-12-28 09:23:31 +0000 Commit: Michael Tuexen CommitDate: 2021-12-28 09:23:31 +0000 sctp: minor improvements in sctp_get_frag_point MFC after: 3 days --- sys/netinet/sctp_output.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/sys/netinet/sctp_output.c b/sys/netinet/sctp_output.c index e77517de2973..17a4df2243e2 100644 --- a/sys/netinet/sctp_output.c +++ b/sys/netinet/sctp_output.c @@ -6237,13 +6237,15 @@ sctp_get_frag_point(struct sctp_tcb *stcb) overhead += sctp_get_auth_chunk_len(asoc->peer_hmac_id); } } else { - overhead += sizeof(struct sctp_idata_chunk); + overhead += sizeof(struct sctp_data_chunk); if (sctp_auth_is_required_chunk(SCTP_DATA, asoc->peer_auth_chunks)) { overhead += sctp_get_auth_chunk_len(asoc->peer_hmac_id); } } + KASSERT(overhead % 4 == 0, + ("overhead (%u) not a multiple of 4", overhead)); /* Consider padding. */ - if (asoc->smallest_mtu % 4) { + if (asoc->smallest_mtu % 4 > 0) { overhead += (asoc->smallest_mtu % 4); } KASSERT(asoc->smallest_mtu > overhead,