From nobody Wed Feb 1 22:27:19 2023 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 4P6c3r0rFQz3cBwG; Wed, 1 Feb 2023 22:27:20 +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 4P6c3r0NK3z4G7M; Wed, 1 Feb 2023 22:27:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675290440; 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=gdmNp8D+G6jyZ1JBtMAxDZHiXwR/4nq11CxUhmj9aoQ=; b=daXaVpA7Mhj5cOCtqodp5KtzG0b8CP7NJOnWZDXZhuFqynj/VsM7DntLMN9dRsR1v1GLRZ 6Za1vlnzqAJoQhGAEVCvgou0oY50eCyzdqlu+yo9qMxNHGUkUhzI8BIoEoeGC4SrtjY3R2 49R6zlPcTX1W4Hi0H7h0AcFDqwhkxXtjNlsId2TeruiqU2qe6ijmMgOtuJmiBd7wwS2/+z yAgp0ktcBM4H+DlzwRxtkKiGGs87IvrSEISjh3Y78Q8kNX3bYwD8cxYY8Umc6P7sIKTGkM 0+vPU7XUEqQmug6Q8FRq0/RnXhcjPOms2ob40/+NOnzPeeJBEGTTLl0gTFZ6zQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675290440; 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=gdmNp8D+G6jyZ1JBtMAxDZHiXwR/4nq11CxUhmj9aoQ=; b=qvBn8ogh4Og7OzNjwUjui2NfYcBuUSrFagktyZxMFPJQk+Il6OTYd+jR3kFBKgP+teAO6b gBjDjaeTaDZWmtLw/SXr96k5K8KvpB2G1k9w3p5hUof5h32NityFNny5KJl6KJQeaSdKkr NL/wBU9JfGshmrwm4vpJaRFlqnON8gAACUMOW8y7GMwWw2yKpqeORmNVNUTtbll0/zWy5K OPL0XS5uu7lCEbgJV/4AxhDMFP2BBcY4YlzeQhELW3/PlJkOxMCDMg8ZZnATeDRZzJ1k88 RIdaEYRBD4x9v+QvkpbOpQE/XrOkb7S9mDmRh6hVR1P4KFd4AeE/xLwTjnxrsA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675290440; a=rsa-sha256; cv=none; b=dXXMGnqcH/jp9ldxRrnfKEb8myn+xjzKPvRSgY9ttu3WFgJj7Aojjn4s0tbsNGyfLlu0r4 v1ZKd9shYnjiVRMO4gYvTV1irYQy1EiHxq+XF3eqGwtVCX2dpEkp/3DCNtgORbC2yc56fc vvnSWxrDl/OPb0hLiBrF3e7LDzFuRkrcw+vkA5kO5HkvTrXsp6X1zFwxWrQsgwcKcMTqB1 vR4mpLKBjeAaLKoWVNhE1LnlxCt3eGZkmTO5cwkl5gj36xZvWScV2O9xKGaNwNy4sfZXwN E2mus6TiGloiLoqBBR+45w6jSTZPa9E4Vg9f9Zgoh0uvKpFK6CIOe8mLF3TMKA== 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 4P6c3q6RjWzWkq; Wed, 1 Feb 2023 22:27:19 +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 311MRJBV071815; Wed, 1 Feb 2023 22:27:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 311MRJLW071814; Wed, 1 Feb 2023 22:27:19 GMT (envelope-from git) Date: Wed, 1 Feb 2023 22:27:19 GMT Message-Id: <202302012227.311MRJLW071814@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: 842ec9984a98 - stable/13 - sctp: don't lock an already locked stcb. 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 842ec9984a98c8dddbdd49d8f5586f3b63f05872 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=842ec9984a98c8dddbdd49d8f5586f3b63f05872 commit 842ec9984a98c8dddbdd49d8f5586f3b63f05872 Author: Michael Tuexen AuthorDate: 2022-03-29 14:33:53 +0000 Commit: Michael Tuexen CommitDate: 2023-02-01 22:26:44 +0000 sctp: don't lock an already locked stcb. Reported by: syzbot+e8dca84da3b4b82f4400@syzkaller.appspotmail.com (cherry picked from commit 5d0c76c7302bad0cd0a9f83a30e11d70141adf37) --- sys/netinet/sctp_output.c | 31 +++++++++++++++++-------------- 1 file changed, 17 insertions(+), 14 deletions(-) diff --git a/sys/netinet/sctp_output.c b/sys/netinet/sctp_output.c index c8e1cc4e3bb2..0bdf4c86d64d 100644 --- a/sys/netinet/sctp_output.c +++ b/sys/netinet/sctp_output.c @@ -13374,22 +13374,25 @@ skip_preblock: } SOCKBUF_UNLOCK(&so->so_snd); - SCTP_TCB_LOCK(stcb); - hold_tcblock = true; - stcb->block_entry = NULL; - if ((asoc->state & SCTP_STATE_ABOUT_TO_BE_FREED) || - (asoc->state & SCTP_STATE_WAS_ABORTED)) { - if (asoc->state & SCTP_STATE_WAS_ABORTED) { - /* - * XXX: Could also be ECONNABORTED, - * not enough info. - */ - error = ECONNRESET; - } else { - error = ENOTCONN; + if (!hold_tcblock) { + SCTP_TCB_LOCK(stcb); + hold_tcblock = true; + if ((asoc->state & SCTP_STATE_ABOUT_TO_BE_FREED) || + (asoc->state & SCTP_STATE_WAS_ABORTED)) { + if (asoc->state & SCTP_STATE_WAS_ABORTED) { + /* + * XXX: Could also be + * ECONNABORTED, not enough + * info. + */ + error = ECONNRESET; + } else { + error = ENOTCONN; + } + goto out; } - goto out; } + stcb->block_entry = NULL; if (SCTP_BASE_SYSCTL(sctp_logging_level) & SCTP_BLK_LOGGING_ENABLE) { sctp_log_block(SCTP_BLOCK_LOG_OUTOF_BLK, asoc, asoc->total_output_queue_size);