From nobody Thu Aug 01 20:18:01 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 4WZgJB1yQQz5RNkx; Thu, 01 Aug 2024 20:18:02 +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 4WZgJB1KRZz4H8J; Thu, 1 Aug 2024 20:18:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1722543482; 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=oFZxlBZFXed0QYjBS87mMAVFnF0nGQTxXraeDnr/p40=; b=d1RESzsmNi8uMC3cUbEezzocw5A88JTlWDyj55fgN/lTBE5q1WnaBK4vx8jguHrE8boNxe cqu8eU+QK+sc8CPURuWAGNo9EvVHlXln5jzsYvYvT1ABCVVbbzQyLRp9sbI/YrsoMYwdTR KVAHDk9ShQFk3U9DotgeMdVdMKald3GwJkEvKf2HT6XO68Gzdd6aFhkhdQO+Yf0wvSiX8J z3FLAGINBlqbvCWybtak6NuKMzn9jR30EOUs2j7v3SfcJNtjqiIPUTkXcvLvKeBoRBQygX GGtjRgzYXUFkJVslynESFKxj1SV7p9Whx1L6Xi64owkYl2Yo6rWkHe21uiS4gg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1722543482; a=rsa-sha256; cv=none; b=p++g53NCTX2q2YYfLVX/hVFJu0iE+z4GWPM3Jj14AVu/uEDOlwe/xFEMkn0pnqJAbbNdjQ 4ZYtcaRVS/QZpuAx8OUoXj4dnihEiBhTw8IIRBGP/43rEzLIxvcEZ33ELK9BOCpmOoKvDq QCP0O2tlj42zm0ZIL1E4TEtphr9OKoA0b7uBvbDQqsmKI82R2BL6XKizinAcAfzs+032ep SVYkdsbGrlPLXo0En4BL5iVqRhak8zgtim1tobAf2OGDMsb/KgwR/HBPAChTIERrOaRw+v qYzyos1mQ+a10vApr04rBw6N5qTvEliOVHpi0kdhTyZSZEo/2jpcGrB+E9vkcw== 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=1722543482; 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=oFZxlBZFXed0QYjBS87mMAVFnF0nGQTxXraeDnr/p40=; b=jaXgLidY/lm0aoMx924QnMQMBgfZxI5wv9oNc4HdWDVQvGasO15KtwAJ80XdjqwfmxRTbt v2j3aOMQiQJEjbB9J/jsNeeA5ecPFlNpgPKDTGkxB4QDOxBBPaMKGXIRjyhju7AzQSvCQZ 1mRtByQX87x8NLou1OiNi3PIRc/Ku+MDOQhrHiC5hoQOQcxWQiCyf2o+y1OE65AaJp5Ba7 vw9hYQMtiHanDQoCck1617YKUtg+G1hFRX/mSPjLAma3w6z55mkCtFsp1n6NgBE5oj/lI8 Psbl8v1KUHhtS9Eo7FCn2ON87TF4XVlqy9x243sTWvGOFvV8Md0xvz2SfWTSgQ== 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 4WZgJB0pLVzybZ; Thu, 1 Aug 2024 20:18:02 +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 471KI1N7003986; Thu, 1 Aug 2024 20:18:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 471KI15j003983; Thu, 1 Aug 2024 20:18:01 GMT (envelope-from git) Date: Thu, 1 Aug 2024 20:18:01 GMT Message-Id: <202408012018.471KI15j003983@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: bf28627b71c6 - 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: bf28627b71c6feae3f3fdf614c7b65d71d682bac Auto-Submitted: auto-generated The branch stable/13 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=bf28627b71c6feae3f3fdf614c7b65d71d682bac commit bf28627b71c6feae3f3fdf614c7b65d71d682bac Author: Michael Tuexen AuthorDate: 2024-02-23 20:40:46 +0000 Commit: Michael Tuexen CommitDate: 2024-08-01 20:15:42 +0000 sctp: improve consistency (cherry picked from commit 533faf21c19d0fa4bc3c0a986c67667991f90883) --- sys/netinet/sctp_output.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/sys/netinet/sctp_output.c b/sys/netinet/sctp_output.c index 7626e4ec066c..ab97d9b13e5d 100644 --- a/sys/netinet/sctp_output.c +++ b/sys/netinet/sctp_output.c @@ -5019,11 +5019,20 @@ 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; +<<<<<<< HEAD /* fall through */ +======= + at += padded_size; + break; +>>>>>>> 533faf21c19d (sctp: improve consistency) 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;