From nobody Sat May 28 17:08:05 2022 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 710531B3CF6D; Sat, 28 May 2022 17:08:05 +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 4L9SmP2knKz3qmR; Sat, 28 May 2022 17:08:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653757685; 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=qW5+2GoB7vVm48dLw6v6vXzX/fl5H8E7de1Bt9NdNok=; b=E9dugjxVV/7pgHSKDs91fAGdjxJs249LwwrBe8uGB/Arh21WJ+NprCjGWXcoWRsBLmozzJ vIhKpK6zCAtBfb+rYsMjZH099DehF0P2T0WMKk9uqUa/ahOdfYHgrmDYoF26fY4fXDvISq 8ANNOF97+ZyBaTuaPw3rS7Kurl6hQdZkKfWQ8ezMkO+5gDai6iP1UbfsvE7VHYb0gNwI7x /fq+9S48xMxfgaC3C3Kx447TMkaPYu/uCZohLL42CSpFZZ/R6x3XiawP6dsjYqwHWYbq+h 2FpEhJBOr2N/9y4XGlBZ58IjvL++D8v78EVm2RdrfJ5AecTxCNkpVPjbN80bpA== 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 3D9C612DD3; Sat, 28 May 2022 17:08:05 +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 24SH85DV091068; Sat, 28 May 2022 17:08:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24SH85Hw091067; Sat, 28 May 2022 17:08:05 GMT (envelope-from git) Date: Sat, 28 May 2022 17:08:05 GMT Message-Id: <202205281708.24SH85Hw091067@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: e2ceff302833 - main - sctp: ignore SCTP_SENDALL flag on 1-to-1 style sockets 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: e2ceff302833ee5f90ac2437efe3670cafcbdd46 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653757685; 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=qW5+2GoB7vVm48dLw6v6vXzX/fl5H8E7de1Bt9NdNok=; b=PKODMR00YhAYAJnptBRcgXuFyRSIxRu/sWQq8BqtsMe+BBcjV9eWbCj/kfmkgD9H1pVAxF zBR39i5raeUcL80PQkMRq+JL6a6q3O8gJs1FtFIwV/A6MN7IYo/x/LfgDvYHylEEEgIwzE L2mhMZka3hhnTsISxhH23gWDTQKsGcEB9MB2J8fkcdum5jwV/UBXvcChU81RDet9t1qVn3 g07f92Q7VfBT1KL4n/2BDCATKhJmRNlzc73QeWLa5DRt3SgtPpz2HHrVKDR4TyWRjWf8bA Br9hie9Uuk1NKcpoVreX1T7rbQkLUklSh0CRzvQ1e+e68kfGxtHX/KJV0Eyhmw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1653757685; a=rsa-sha256; cv=none; b=TTqxJ96i0fd1eXAboGarjVHPgk41D0duIWTTWc3TYC7bXjzmgcDRuhNZXdvS/vUuCeGooB OGbq8Td65hAWWbtLVGNPeis83tITVKa7zEm/3gHGPnvBkOnIaL274xWMmGY6cOB1cwuVbQ krS2u6mIpNrlah4VE8Uljeyf1yiY895hyWFTlnyDZxtyOA9+1jcMHr2Unp6tqYm3FXZIWK DvyXlzDM+BDfTHSuDTTJCUF+wp4ynMaJH5U4fgnf8NIpeUEGNIftrMtdnA/URDomhcpacB Xog+rl1n4ovielU7ki2cA+GgjMR8Yn00YClBEY3h3ykuKzAzBfcfbc9NDLQtgQ== 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=e2ceff302833ee5f90ac2437efe3670cafcbdd46 commit e2ceff302833ee5f90ac2437efe3670cafcbdd46 Author: Michael Tuexen AuthorDate: 2022-05-28 17:07:10 +0000 Commit: Michael Tuexen CommitDate: 2022-05-28 17:07:10 +0000 sctp: ignore SCTP_SENDALL flag on 1-to-1 style sockets MFC after: 3 days --- 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 3b674ba22666..c012618ca181 100644 --- a/sys/netinet/sctp_output.c +++ b/sys/netinet/sctp_output.c @@ -12537,17 +12537,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);