From nobody Thu Aug 01 20:21:19 2024 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 4WZgMz6rDWz5RNjQ; Thu, 01 Aug 2024 20:21:19 +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 4WZgMz6N6dz4Hqb; Thu, 1 Aug 2024 20:21:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1722543679; 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=kr8lLOsHyQN+2JEMlXnnU6hLDz1MpGuMK1vwvLh/mgA=; b=nF/ZovXanF3upXGUseQ+KGJqRxQTY/74RhVm5WnXNdQgJJ50IfWHfZ6dUU86r82R7jQ77f l6DkYqBPHKelsoLry0x8PEwfdWv3LKghGR2b7MKFDTRd02YEKOOj0JBDSl9HHFjg2BH16w hQpxE8fMMDnhoh+twa24ium9y5pRELIb0LtY6wYyOeU43h2L2fNUU80MxY1CFyJ4NRohYr LXN5OoVgBN0eco9ASBvpPO/GuRDYruFp/c7mOJ5yF3A69YNE5a7lmrGvO1ml10VFiiFkI9 CRx6tRtB728bbFNsTZwH2em5SSRctn0g2T4ORqAEVn92QoEc+NYxcZqXFLIZyA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1722543679; a=rsa-sha256; cv=none; b=kaUwO2a6JFKmeqxOO98A0k/b1jl72F99dCOSKdi3PXyzyhm2sAGc1VMnyDmmrCCNg2iUl5 Qq3kYK3utkTRm5LK/Z123iwfOX1YGxRzQlUfCiEwSRcMzp79nzULzSslvXshUgYxF2SRcq sbb9+V7w1JQIo1CYp51GlshJpLGtbMgiurufqJ5nYqu8gxKTMAkZLlz8sTE4uji8ZxeLGn cFBAVms/1g3zsC3/xMEfkHk4B4r5EUXhWS2cWcVDYfqLSDMkIg4G5ZTmmQdDGL5fLHkkl4 E17b8QFecZNdBtTEcTyfPmMmlZPirCjmqfAOvhxmqng/xBuPaaa/2Poxp9w+mw== 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=1722543679; 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=kr8lLOsHyQN+2JEMlXnnU6hLDz1MpGuMK1vwvLh/mgA=; b=az5HqW34umZGdZ9aNmvcrn6rCivZ2KpOJilgTjDMsrohgobXSgF6VjW8jtkrPi0W/olGH5 IixiF+j2lddWfKpkFGJ/Z4sUDn46i3iSIetLHrVERmeatg3D/80uUgNYYn80SQGElsnHBp Pw7T4kv3LmJFCFg+pJWV1At5l5DL+IOPvIwLE9ZJ72aDaJLCN2jvbOd5OU/y5AWYRPPMkV TcRKyhXTO/RAOE6qVdFVZDOHc6w8pSTbROC2Dr7hWMsbCSaBbykKu5Iodyt7TxqOY/oJi2 g8/ek4M+513sT6Jllpw5CGC/GWJbXJpgvkYyEt2+vpwo0IBJmu+JsezEvJ6thQ== 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 4WZgMz5zGwzybr; Thu, 1 Aug 2024 20:21:19 +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 471KLJQU015274; Thu, 1 Aug 2024 20:21:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 471KLJ7L015271; Thu, 1 Aug 2024 20:21:19 GMT (envelope-from git) Date: Thu, 1 Aug 2024 20:21:19 GMT Message-Id: <202408012021.471KLJ7L015271@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: af08cafda0d1 - stable/13 - sctp: improve consistency 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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/stable/13 X-Git-Reftype: branch X-Git-Commit: af08cafda0d10a64bae8328126868c527171963b Auto-Submitted: auto-generated The branch stable/13 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=af08cafda0d10a64bae8328126868c527171963b commit af08cafda0d10a64bae8328126868c527171963b Author: Michael Tuexen AuthorDate: 2024-02-23 20:40:46 +0000 Commit: Michael Tuexen CommitDate: 2024-08-01 20:20:46 +0000 sctp: improve consistency (cherry picked from commit 533faf21c19d0fa4bc3c0a986c67667991f90883) --- sys/netinet/sctp_output.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/sys/netinet/sctp_output.c b/sys/netinet/sctp_output.c index 7626e4ec066c..f13010e54521 100644 --- a/sys/netinet/sctp_output.c +++ b/sys/netinet/sctp_output.c @@ -5019,11 +5019,16 @@ sctp_arethere_unrecognized_parameters(struct mbuf *in_initpkt, at += padded_size; break; case SCTP_HAS_NAT_SUPPORT: + if (padded_size != sizeof(struct sctp_paramhdr)) { + SCTPDBG(SCTP_DEBUG_OUTPUT1, "Invalid size - error nat support %d\n", plen); + goto invalid_size; + } *nat_friendly = 1; - /* fall through */ + at += padded_size; + break; case SCTP_PRSCTP_SUPPORTED: if (padded_size != sizeof(struct sctp_paramhdr)) { - SCTPDBG(SCTP_DEBUG_OUTPUT1, "Invalid size - error prsctp/nat support %d\n", plen); + SCTPDBG(SCTP_DEBUG_OUTPUT1, "Invalid size - error prsctp %d\n", plen); goto invalid_size; } at += padded_size;