From nobody Tue Dec 28 08:42:36 2021 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 784B31919650; Tue, 28 Dec 2021 08:42: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JNShs1Y4rz3DFR; Tue, 28 Dec 2021 08:42: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 1536D64AA; Tue, 28 Dec 2021 08:42: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 1BS8gaV9021479; Tue, 28 Dec 2021 08:42:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BS8ga04021478; Tue, 28 Dec 2021 08:42:36 GMT (envelope-from git) Date: Tue, 28 Dec 2021 08:42:36 GMT Message-Id: <202112280842.1BS8ga04021478@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: ca0dd19f0933 - main - sctp: check that the computed frag point is a multiple of 4 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: ca0dd19f09335496390829851862c894f89a87f9 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1640680957; 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=9Z3lYlEF8lIOfuDuVyaj8dYK9EKyilJ/pFo+10Zwj7o=; b=FUKWv3P9+l6d1PFE2JDRVFcwuzWU/Oiuv4OZdww3ndyp3AfkXc8voipVS9zpo+tKEw3B2t PJ2iKLZse6cQpA0onBAaeWOQgk8nQK5AB1jsKEftRczv9wbudJvTejg8r0lVpt/gU4ymPJ ZjyL/mBrYl/sCOTujhSKRQNTXZ7muJBtv8sEJi38+VUopiDvGkQotDto2Zs8r1wAB8skrY gjFMui4wBgKj0yJWZhIEO3vISqIAqJlaVck2f+qi7GEbl/opA7u+6R9R/WPdc+fANQwoF5 nppNb9dxfek5jpGEM59uTFZ4t0whPc2E6BCwUI2dwYwUnzK3feEM3DnbPgG4rw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1640680957; a=rsa-sha256; cv=none; b=pgDMDzvKN5CkeBfW1urwReL+LyyttfRJ2CNVRSBfMz1RrxKchnXN5FOqQTtYnKbQcPsB7X 0TxaKw0Qkk3jonzDaaIBNnqc5U8Awn7mj7CtdPCus3llBrvFLSCVlqLZParu+dhem3MkEe CEy6guPE56HRGkuISRsv2Y8JENlLAf+qkopDdJQIH6JfNCQkDa13UplU6QC2wjjW7G0Avu mGDk2Ep4KZQbH3Nzn5ojXE0R0wP87HW1raBrSu2QCSUr1ggwgRFO66QafRfPSQf4YiqBz8 ZwD0f2JeU9PzIKCfllqVrxoEv3l/ksclzaZe8mV0BsTxI0VbFYdapXWw8Hi0oA== 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=ca0dd19f09335496390829851862c894f89a87f9 commit ca0dd19f09335496390829851862c894f89a87f9 Author: Michael Tuexen AuthorDate: 2021-12-28 08:40:52 +0000 Commit: Michael Tuexen CommitDate: 2021-12-28 08:40:52 +0000 sctp: check that the computed frag point is a multiple of 4 Reported by: syzbot+5da189fc1fe80b31f5bd@syzkaller.appspotmail.com MFC after: 3 days --- sys/netinet/sctp_output.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/sys/netinet/sctp_output.c b/sys/netinet/sctp_output.c index f6597bc6cbdc..e77517de2973 100644 --- a/sys/netinet/sctp_output.c +++ b/sys/netinet/sctp_output.c @@ -6246,13 +6246,12 @@ sctp_get_frag_point(struct sctp_tcb *stcb) if (asoc->smallest_mtu % 4) { overhead += (asoc->smallest_mtu % 4); } - KASSERT(overhead % 4 == 0, - ("overhead (%u) not a multiple of 4", overhead)); KASSERT(asoc->smallest_mtu > overhead, ("Association MTU (%u) too small for overhead (%u)", asoc->smallest_mtu, overhead)); - frag_point = asoc->smallest_mtu - overhead; + KASSERT(frag_point % 4 == 0, + ("frag_point (%u) not a multiple of 4", frag_point)); /* Honor MAXSEG socket option. */ if ((asoc->sctp_frag_point > 0) && (asoc->sctp_frag_point < frag_point)) {