From nobody Thu Jan 11 12:50:07 2024 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 4T9kz33TtXz55fFs; Thu, 11 Jan 2024 12:50:07 +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 4T9kz330fVz49YK; Thu, 11 Jan 2024 12:50:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704977407; 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=wVXdG6tjNwcw6dplRzFz+u+pSMh9uFNa4ENxWFRxU0k=; b=RYYZa8RxRDceqAEUjScsK0ktchfam9CRFPmhfuFhMr5+9wXSHR1O7RR7mY8BOYi+1KAvuT gy9+hqp/hEcm66e8CHRlonJkBMnlV5+9aiZtH8uAPoEFeSkQ+YWaBjVC70voitrlPQP6ey /kpaOW24mz0JBRcQvnaw+Y1qrYbItcVM8Jb5ODlIN4vi9YV8CP81yH+A5JUlL9BLJAq5XR YRXP2AxLbFI8d221PLrDY5L75qxIvCIRPmixlCCsFKLHvTlMcqTIF5+qFPzIl2KNLxHchA IRy5v2ycg7oktT2uKXfI4ABOif/gE4EJGYqTXoEK/FqbIcgzcv+7l/EO2PnElQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704977407; 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=wVXdG6tjNwcw6dplRzFz+u+pSMh9uFNa4ENxWFRxU0k=; b=caiy386+KSlZrJ+yymwXKDBtAIRsbrGCFePbsk7wA+K6CUfduwvX1KebFVMKLXw9Wru/KH NgAJTn58xzPzd7hTpsQC+oEUU9sY3L5+62d7hkX+srfcCTWl4OROkHz75/Ixh651jXd3Bx 8yYXyERbOCTAeEUr9No6SN7dKwAeTp7DpWQrI5S1Vu2lW5sqEPm2w3/U8FaTwKvCAXWPRj X1BxnfOOkAkD5W2JEjBaCCBoprciD4z3yL6iUYxnGn1Xa1nCc/GLQqTarQsIDBMOvvMm1W ls/ImpiPJItZUVebMjQ2Xlw3E1BgfHG6pkjUnBXC5d0Ld2OBGIWKvpAChASMfg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1704977407; a=rsa-sha256; cv=none; b=Nl3Tbb140hIP+694PVelx3yufYEbUlvpQFNJ28SFaU1tv+l+1sAT8JQ2Ln4d0wRyNtoODz i+8rD7h8YHJ0R18C08e8LECO7wjReJXTna4Q5i/utrdOsqGWg8/UsnTVKr0Du7Stm+afqg yuo4syYP/dcF7SsuPveqPqIiObUHy9Chk023spfokNSdBtTOHn+uZ60riAjo9fen5YeuX5 4ZaOw3XAgVwGEBEh6x39KeCLt5urmYzL+SMDHlX1Sley4s+1+HkcrJ+Z9Nqbj1pY5vBFB6 xLFcp/+LBijrUIEze29RpzAIeNvFXILbAC5aJvrAocaZwyLY8iPeoM5IlbTC3A== 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 4T9kz323h2zJsg; Thu, 11 Jan 2024 12:50:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 40BCo7oX039970; Thu, 11 Jan 2024 12:50:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40BCo7Ra039965; Thu, 11 Jan 2024 12:50:07 GMT (envelope-from git) Date: Thu, 11 Jan 2024 12:50:07 GMT Message-Id: <202401111250.40BCo7Ra039965@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: 6ebc41462538 - stable/13 - sctp: cleanup 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: 6ebc414625386c9c90f115e1f132af22dc881b43 Auto-Submitted: auto-generated The branch stable/13 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=6ebc414625386c9c90f115e1f132af22dc881b43 commit 6ebc414625386c9c90f115e1f132af22dc881b43 Author: Michael Tuexen AuthorDate: 2023-08-25 15:23:34 +0000 Commit: Michael Tuexen CommitDate: 2024-01-11 12:49:44 +0000 sctp: cleanup No functional change intended. Just asserting the conditions when being called. (cherry picked from commit f0c8e8118dbcc9251b11154ee7e4680f79901af1) --- sys/netinet/sctp_timer.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/sys/netinet/sctp_timer.c b/sys/netinet/sctp_timer.c index ef5eb8b89a5d..d0f3f936b34d 100644 --- a/sys/netinet/sctp_timer.c +++ b/sys/netinet/sctp_timer.c @@ -87,7 +87,10 @@ static int sctp_threshold_management(struct sctp_inpcb *inp, struct sctp_tcb *stcb, struct sctp_nets *net, uint16_t threshold) { - if (net) { + KASSERT(stcb != NULL, ("stcb is NULL")); + SCTP_TCB_LOCK_ASSERT(stcb); + + if (net != NULL) { net->error_count++; SCTPDBG(SCTP_DEBUG_TIMER4, "Error count for %p now %d thresh:%d\n", (void *)net, net->error_count, @@ -114,11 +117,6 @@ sctp_threshold_management(struct sctp_inpcb *inp, struct sctp_tcb *stcb, sctp_timer_start(SCTP_TIMER_TYPE_HEARTBEAT, inp, stcb, net); } } - } - if (stcb == NULL) - return (0); - - if (net) { if ((net->dest_state & SCTP_ADDR_UNCONFIRMED) == 0) { if (SCTP_BASE_SYSCTL(sctp_logging_level) & SCTP_THRESHOLD_LOGGING) { sctp_misc_ints(SCTP_THRESHOLD_INCR,