From nobody Wed Feb 01 23:00:24 2023 X-Original-To: dev-commits-src-branches@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 4P6cp04Lsmz3cH2k; Wed, 1 Feb 2023 23:00:24 +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 4P6cp03np7z3Fjj; Wed, 1 Feb 2023 23:00:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675292424; 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=ZETE6Qwkcb2fyKjCxsmcdpd8bW6zfXZ7RtSWd9wui8g=; b=rH9aH+EWHUyAYt+vpn2FNZvAJ1Se1czmmNaNhQysNJZdK5lrTHjL37+PxmCbK8bQy3QAEF 6IcmKuhVymRWyOwVl83Fgf2TjiuzMqcE1vboGlDvvSKb2zRhJ1GBnPFoUcos89zpJ7VZGX n04ZvvO6OeptSZreRZVPs2uwOwUdgrISC9BdL/JoQ3TM/OtgO8p9Yf4uMCUk5vA2JdVUgC hKl0L7DJ3k26TQlOTdRf6ydiPdetTJA0mL6l4yTF6LGhSn0sIclXfoWXTQs1envmBDMah3 M+JKS9fPDcLRIuV9Ne8HJ+XyrD5TftQ6dSR5EScN0Ljhe4U4rxgvIA6XQjUFkw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675292424; 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=ZETE6Qwkcb2fyKjCxsmcdpd8bW6zfXZ7RtSWd9wui8g=; b=lybUVfXN9UvwnVUnG0umg+f35KbMwaWqfPBWFVqerryZ9OCkeinKm0bL6DKTo8VtRU3Pbz fG5xXvahoeu7ep70666ZvsrENjXqKTx91yZherphHUs/aILRMiXNlHEhdX9wjyAfGn2n2w JkarFxjd/xNSWKVuqUIdmjFaSFqJDubPc2eWQk9NFFy2hIWMjD3RMa+tw1OHDxMnzdnEf4 ucLqHOwgkfYErHZ0T9MkG5cT7a461Q7I4Wx9sqE43kA+IuRuxHIE/rru9C2y34iRYNe18D AZ1RyXqDDud/iB1L6cQWXvLtlmzIRD0K/fXX1GkN93L09TMNOMODSw/LS4/MkA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675292424; a=rsa-sha256; cv=none; b=byiytzjNXERD/xfAiDwZUR/HEqgkYwA28MCSVp1nARjNq77fmrk4R2dA0ltYiKzMqPnMVi +oFk/RVxQ5cH0q21O22A5n8I9qfjH3JlC2KtlbJEUgJ3hoYnB38r62q1lZLY/BpOBjMvDh ukyERLwLIH48r0KtwPfxFHjjBHvcVOGcQaYxlJip1V02qMtdCmLt9oqA1KaguV4NaZeUix HfVPD9Ti+gd27kYdW+lIL8XmfnBPcv2CBPz99DhqlpG0Z/GOtzucC0RLIVaZpq6+xRJs9N wkEa/Bb4vPdtN56K2xpzO4MSUHvGvanCAaXEcx8XB4OhQTcz9VH93bQgAD36KQ== 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 4P6cp02rXVzWvn; Wed, 1 Feb 2023 23:00:24 +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 311N0OtV027669; Wed, 1 Feb 2023 23:00:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 311N0OlC027668; Wed, 1 Feb 2023 23:00:24 GMT (envelope-from git) Date: Wed, 1 Feb 2023 23:00:24 GMT Message-Id: <202302012300.311N0OlC027668@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: 094bf09d81d0 - stable/13 - sctp: ignore SCTP_SENDALL flag on 1-to-1 style sockets List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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: 094bf09d81d01c28c22c1969498abf241148fd06 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=094bf09d81d01c28c22c1969498abf241148fd06 commit 094bf09d81d01c28c22c1969498abf241148fd06 Author: Michael Tuexen AuthorDate: 2022-05-28 17:07:10 +0000 Commit: Michael Tuexen CommitDate: 2023-02-01 23:00:00 +0000 sctp: ignore SCTP_SENDALL flag on 1-to-1 style sockets (cherry picked from commit e2ceff302833ee5f90ac2437efe3670cafcbdd46) --- sys/netinet/sctp_output.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/sys/netinet/sctp_output.c b/sys/netinet/sctp_output.c index dfad4e5dfa08..7c0c953c7504 100644 --- a/sys/netinet/sctp_output.c +++ b/sys/netinet/sctp_output.c @@ -12535,17 +12535,19 @@ sctp_lower_sosend(struct socket *so, if (flags & MSG_EOF) { sinfo_flags |= SCTP_EOF; } - if (sinfo_flags & SCTP_SENDALL) { - error = sctp_sendall(inp, uio, top, srcv); - top = NULL; - goto out_unlocked; - } if ((sinfo_flags & SCTP_ADDR_OVER) && (addr == NULL)) { error = EINVAL; goto out_unlocked; } - /* Now we must find the association. */ SCTP_INP_RLOCK(inp); + if ((sinfo_flags & SCTP_SENDALL) && + (inp->sctp_flags & SCTP_PCB_FLAGS_UDPTYPE)) { + SCTP_INP_RUNLOCK(inp); + error = sctp_sendall(inp, uio, top, srcv); + top = NULL; + goto out_unlocked; + } + /* Now we must find the association. */ if ((inp->sctp_flags & SCTP_PCB_FLAGS_CONNECTED) || (inp->sctp_flags & SCTP_PCB_FLAGS_IN_TCPPOOL)) { stcb = LIST_FIRST(&inp->sctp_asoc_list);