From nobody Wed Feb 23 00:20:30 2022 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 B16B319D65FB; Wed, 23 Feb 2022 00:20:30 +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 4K3GsB4fCCz4bT1; Wed, 23 Feb 2022 00:20:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645575630; 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=ZXTcaNYnyELbXlZgIThNP4SxtPFIBstEozoN+wspVA0=; b=ohx8kGf89/bXqGxIGEa9ls3i4dbO2HFSiCNYv94t/6apeqADwsKhTh53f47oWGMpHZ2v+D KDbGfyj5UEOuCZtcp1WLLT3z2IFE6udQF6YZGmWFiQ6WhwR0a7uZYkbjjIZPDJsz12+Tlr /mAiCtp9dw7dUckPZNgW0H0K96wH9Mg6ABh9RVlyYEC9mFzhgM5pEUpJ/ZfPU4UV186X2p V/iRagSAvMSL31BvDX4NIecbbJBcEw1FsCwJozK3BNZUHEZ62rLAyjX2lNjA6tSvDxaMTT rJKtJkvsJICspSEWrkQRhpaAen+E9J0eEtG2upmuwrhvcTFe9pUcvdhsJnqJYQ== 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 7F4FD626F; Wed, 23 Feb 2022 00:20:30 +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 21N0KUX4088490; Wed, 23 Feb 2022 00:20:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21N0KUnX088489; Wed, 23 Feb 2022 00:20:30 GMT (envelope-from git) Date: Wed, 23 Feb 2022 00:20:30 GMT Message-Id: <202202230020.21N0KUnX088489@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: af04a618ed08 - stable/13 - sctp: make sure new locking requirements are satisfied. 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: af04a618ed089c016f5a76794b0cebd0e9a732ae Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645575630; 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=ZXTcaNYnyELbXlZgIThNP4SxtPFIBstEozoN+wspVA0=; b=EXdRo9rIfRdn7NGYGaJZ6CE3pHKpDWjubpShr3XDIaqx38uXCDhoEOj3QPCeUHlh7kUiu/ FYjdjJ8FE3e3fRic+dwPJ5JcqtkKPwXkF/eUzpCoLUhVcCSPbdL2pD9muknyKgledcC4d7 SyaWUZ+1DTCVJiYJYnQFsvrIZGQa+8dx18isZ1vs75Bu1tG4cq0aj2TdbEFl0p4v/Mc78L EDyUS0YpF8AKA8V94tT0QOquXcFKaKdsmWgocstOFsndLRoeWnA3Y8Q+59jEeQVglrmlM+ zMUFMjiKbQ7oU5hAX+eKuXUxVcIcZVnm5XXgq0dZpf9PchkndYMD5nJroiPRfA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1645575630; a=rsa-sha256; cv=none; b=JvMJyk4r8CTShTIcpskPplXEpbtQwO3Q55NPmWEUNnyC0yoPpcaqFVcVKdU/4Zwf37TCbN dJu74MLEg7IYcxvCywQiJDo3c8blMjjWtLPORBQSajQIfS93nXY1/ifgObSjcD2McjTxX/ 0Lxn+MpsiAP+bowDYShZZR0B77dffo046hNrhVbVbqhng5U8qMlMtvi2PZYTrKbL+q1SvY ksYu+SNkTGg8vzKfiubwKKw+EEALzGq+wh9R+Dew7p6vqPmpbqfn+ieeLELz4fhfd8iJzd zOEAhNbMnpJm9rCSd2BOvLXdUW6bUuN7eYxJ9LQxzBHxlX9INbgilAAl7dBMPg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=af04a618ed089c016f5a76794b0cebd0e9a732ae commit af04a618ed089c016f5a76794b0cebd0e9a732ae Author: Michael Tuexen AuthorDate: 2022-02-20 14:31:53 +0000 Commit: Michael Tuexen CommitDate: 2022-02-23 00:19:01 +0000 sctp: make sure new locking requirements are satisfied. Reported by: syzbot+cd3c1dd64861b8c200bd@syzkaller.appspotmail.com (cherry picked from commit e255f0c9fbd2e1b27f57459d3af18fa19166969d) --- sys/netinet/sctp_output.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/sys/netinet/sctp_output.c b/sys/netinet/sctp_output.c index 86cf2ed75e90..43804b161cda 100644 --- a/sys/netinet/sctp_output.c +++ b/sys/netinet/sctp_output.c @@ -13321,6 +13321,10 @@ skip_preblock: sp->processing = 0; } SCTP_TCB_SEND_UNLOCK(stcb); + if (!hold_tcblock) { + SCTP_TCB_LOCK(stcb); + hold_tcblock = true; + } goto skip_out_eof; } /* What about the INIT, send it maybe */ @@ -13513,8 +13517,8 @@ skip_preblock: if (error != 0) { goto out; } -dataless_eof: +dataless_eof: KASSERT(stcb != NULL, ("stcb is NULL")); KASSERT(hold_tcblock, ("hold_tcblock is false")); SCTP_TCB_LOCK_ASSERT(stcb); @@ -13602,6 +13606,7 @@ dataless_eof: } } } + skip_out_eof: KASSERT(stcb != NULL, ("stcb is NULL")); KASSERT(hold_tcblock, ("hold_tcblock is false"));