From nobody Sat Apr 2 12:45:03 2022 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 4C5821A42A72; Sat, 2 Apr 2022 12:45:04 +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 4KVxZm1PjJz4RD3; Sat, 2 Apr 2022 12:45:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648903504; 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=gn1/xfiw9y2Du7QQfod5InjJNwkB9i2UkwXkgDXFtNI=; b=guF3ALoxqvVU4w2yuneMbkhWR8NcT+1gkfVD4hKc7XXFjKToFwRZO+AtDl0KYoXmxokuw7 SInrtnkLtOMMmFZmKxU4BXceltq2U+AgZhbd1zz7+jC1QuFwcTXAoe1osoCPM3ogARJox1 GSycBttxnv4R68tAbtTVPoJpyfvOQRwc3lQ/7bRTJH96rhyK4opJO+Qa/0TXtnwnvoHZdd 8E55bIBwRPjJk4KqOhe5moJNYlL+4GJ9Us4YVzMq2TfPC/zg6XINnWdg5CrAK71Zs8dG1w u7PTdniyGKDTvN3blPaMV3IYdUSeNPnsfGsS/rENPfKKC52Y5rAiTz0+I1rqTA== 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 C74E3EFB; Sat, 2 Apr 2022 12:45:03 +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 232Cj3Ir031222; Sat, 2 Apr 2022 12:45:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 232Cj3Q2031221; Sat, 2 Apr 2022 12:45:03 GMT (envelope-from git) Date: Sat, 2 Apr 2022 12:45:03 GMT Message-Id: <202204021245.232Cj3Q2031221@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: b1fe92b28ba2 - main - sctp: remove a test, which isn't safe 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/main X-Git-Reftype: branch X-Git-Commit: b1fe92b28ba2e77395598db1c2ff1976b55c86ab Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648903504; 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=gn1/xfiw9y2Du7QQfod5InjJNwkB9i2UkwXkgDXFtNI=; b=JSKB9/3F5V0FaizMIR54SQKlAW1ZI/ikRwH4dkvWZmXGyvyYh59vzTjuuSr1M9chfBIpgd NjnogREk29dv66ylsrmPODoN0oB2ht2Rwi49XCqKZM634x2hiYSjU/TeeyZMu9EgYB0IBx pyOn0vHGAvEZ/I76b315F67IPras8fW3iT15puDmw3CD4TYcWLW12Yu4/+bm9CcGtApCVT YFwgXun9UiufLL+8ipTtGr2TtOCQXI5qCo8hpQmRdRJFa44wN5H+O+kuWdthbSB98Cj55g 8ZY7ftcgNQjy+3vC2AVvzEhHusUPdFrIRd5AZUDWCq9K7TDS9mKjJfcTjQzXQQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1648903504; a=rsa-sha256; cv=none; b=MMKo+JXh3/dXh1ZWaL6OWYBbG+AC/IyXDhs9rdgx+nvd4Ve7dXZcQJC19Jd3Q+OtlSuT/N GSgFUYr9v4DCK2AU3oFuZ6VRvcvG1y6C5F7n6g5NmrUBIaJog3YucZagfzgJV3iLRVVRur Be6UGnEXxsvHtMODDmJTQzRXyZ4cOlqi4NrpmLwNsHwNe30SYXf9+l5x1NFZq/LoGhTUKx GL5/9FrQa3GbCtO6twX0iPLSJh301O5/DXiev5YLg7oadLW6bjKW39mBMLTbMT38OskHRG V5oJnrJhh+C7+j4uJPGDWmCrtCRaUQZFBgPUar45/VYqFEIQB6BI04EaesntpQ== 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=b1fe92b28ba2e77395598db1c2ff1976b55c86ab commit b1fe92b28ba2e77395598db1c2ff1976b55c86ab Author: Michael Tuexen AuthorDate: 2022-04-02 12:44:06 +0000 Commit: Michael Tuexen CommitDate: 2022-04-02 12:44:06 +0000 sctp: remove a test, which isn't safe We can't ensure the stcb is still around. This issue was found by syzkaller. MFC after: 3 days --- sys/netinet/cc/cc.c | 29 +++++++++++++++++++---------- sys/netinet/sctp_output.c | 5 ----- 2 files changed, 19 insertions(+), 15 deletions(-) diff --git a/sys/netinet/cc/cc.c b/sys/netinet/cc/cc.c index 55a5f6ef652e..a009998ca920 100644 --- a/sys/netinet/cc/cc.c +++ b/sys/netinet/cc/cc.c @@ -280,15 +280,12 @@ cc_init(void) /* * Returns non-zero on success, 0 on failure. */ -int -cc_deregister_algo(struct cc_algo *remove_cc) +static int +cc_deregister_algo_locked(struct cc_algo *remove_cc) { struct cc_algo *funcs; int found = 0; - /* Remove algo from cc_list so that new connections can't use it. */ - CC_LIST_WLOCK(); - /* This is unlikely to fail */ STAILQ_FOREACH(funcs, &cc_list, entries) { if (funcs == remove_cc) @@ -296,25 +293,36 @@ cc_deregister_algo(struct cc_algo *remove_cc) } if (found == 0) { /* Nothing to remove? */ - CC_LIST_WUNLOCK(); return (ENOENT); } /* We assert it should have been MOD_QUIESCE'd */ KASSERT((remove_cc->flags & CC_MODULE_BEING_REMOVED), ("remove_cc:%p does not have CC_MODULE_BEING_REMOVED flag", remove_cc)); if (cc_check_default(remove_cc)) { - CC_LIST_WUNLOCK(); return(EBUSY); } if (remove_cc->cc_refcount != 0) { - CC_LIST_WUNLOCK(); return (EBUSY); } + /* Remove algo from cc_list so that new connections can't use it. */ STAILQ_REMOVE(&cc_list, remove_cc, cc_algo, entries); - CC_LIST_WUNLOCK(); return (0); } +/* + * Returns non-zero on success, 0 on failure. + */ +int +cc_deregister_algo(struct cc_algo *remove_cc) +{ + int ret; + + CC_LIST_WLOCK(); + ret = cc_deregister_algo_locked(remove_cc); + CC_LIST_WUNLOCK(); + return (ret); +} + /* * Returns 0 on success, non-zero on failure. */ @@ -628,7 +636,8 @@ cc_modevent(module_t mod, int event_type, void *data) * If -f was used and users are still attached to * the algorithm things are going to go boom. */ - err = cc_deregister_algo(algo); + err = cc_deregister_algo_locked(algo); + CC_LIST_WUNLOCK(); if ((err == 0) && (algo->mod_destroy != NULL)) { algo->mod_destroy(); } diff --git a/sys/netinet/sctp_output.c b/sys/netinet/sctp_output.c index 5f205b1c3af4..4ef771b0cc1a 100644 --- a/sys/netinet/sctp_output.c +++ b/sys/netinet/sctp_output.c @@ -13657,11 +13657,6 @@ out_unlocked: if (free_cnt_applied) { atomic_subtract_int(&asoc->refcnt, 1); } -#ifdef INVARIANTS - if (mtx_owned(&stcb->tcb_mtx)) { - panic("Leaving with tcb mtx owned?"); - } -#endif } if (top != NULL) { sctp_m_freem(top);