From nobody Thu Jan 11 12:57:55 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 4T9l833BLjz55gYd; Thu, 11 Jan 2024 12:57:55 +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 4T9l832j0Tz4DTh; Thu, 11 Jan 2024 12:57:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704977875; 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=FnHmVdLoczfldwyWF/6ZvEsJrpWHewStsOElg9XQ61U=; b=kysz8GbvT7kdql7GIrJLwlzd2V4Yzcwe1hwb1r89/mcM5pp7exSWu6tABZHDcUOpkppUUs UHuZqdSleN87nOV8R2MZw030jIGT9SDYDaM0zlapSFky0Q1i31mBVzGFaqZFLIYLHyqeIX kLkLRuoQUmojaKxjfQH7v9r+S9O/Rn56W4X8PVTQYcCptTUmdPKfX/67g9E+lIeIDm0D9i M+vOqIZ8M7f82KAaU6Jo4GToGXKdVhQaZiD2DgrjW+7fzJIiyvPqMCZEwElrPTa4OZgOTU YERP6K3dZW+Mdp8YQkVB749xsAb2Y53FqZfycCwgK5qhadqdPNNut0iZo4+JNQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704977875; 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=FnHmVdLoczfldwyWF/6ZvEsJrpWHewStsOElg9XQ61U=; b=OFmmNoCenEx4WSN7kwzRo802ONU+8oFoGk8X7Z7PUe84JWZ5anC2M+yvLJQ84ZtJXR0Nbf EBGIC4e5LhgnzLUcMZ7/z/jHjbtQeexmvyF9zjiSTlJirGsASR+DriYvgIMmd3J1xoUPLD 3aRELlBBDvfIoQKGkqXch3picJjOt1OJLuxcrn8X4tZXIG6AQlwBLIMR0d/qG0i8covy1k YOF3lJtrC9sy+ZVjbS4e8NLasScB3nludSUYkXuWmickDdi1XwK7AqRNHinYmaatYMY4n3 YH3T7V5tbllOtgGk9zSfC5h8t1CzyewdKHpTcE0V4TpcZwZBSrcn3UEAA+cT7g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1704977875; a=rsa-sha256; cv=none; b=kcLXD6TMq2GjZ0rejhvDeIRmTAoGhP9qSu6EKdUtea7O+gOaWjf2UVkb+7fETZYHEFDFLE ur+dQdsR+DRgTXytolfyxpoE6m5spLeA7F9SkF6flk2yWT66Pq2/i9WvJCtcrYS0w5OjRa RJmvrhGU5xzpjpwoxfUKD9alyzHCTJ7a7ocMq5Bw9g06dcakZ+rlTzQkLB6ju1HfNRA2D+ xeCVhfM1M1teskEqSXrOaVnhndHOJHT12q8z5L5va3VMvnAy7j5ZF33Jn979kHOLt2dytD NeO4hmokghL/XglJ6b2m8HOMlQxZ5PFuInioBOcdiRCVvxWYHGh2Lhz2n6xiEw== 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 4T9l831lxczKHC; Thu, 11 Jan 2024 12:57:55 +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 40BCvtK8054701; Thu, 11 Jan 2024 12:57:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40BCvtcN054698; Thu, 11 Jan 2024 12:57:55 GMT (envelope-from git) Date: Thu, 11 Jan 2024 12:57:55 GMT Message-Id: <202401111257.40BCvtcN054698@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: 2d12958d4b5b - stable/13 - sctp: don't call sctp_ulp_notify() recursively 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: 2d12958d4b5b0cd7799662f3f69284c716264f92 Auto-Submitted: auto-generated The branch stable/13 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=2d12958d4b5b0cd7799662f3f69284c716264f92 commit 2d12958d4b5b0cd7799662f3f69284c716264f92 Author: Michael Tuexen AuthorDate: 2023-09-08 19:19:59 +0000 Commit: Michael Tuexen CommitDate: 2024-01-11 12:57:29 +0000 sctp: don't call sctp_ulp_notify() recursively This does not work with the new locking scheme. (cherry picked from commit 1e81a4e7e89bb1870bec84e42284ad10505e957c) --- sys/netinet/sctputil.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/netinet/sctputil.c b/sys/netinet/sctputil.c index e6121a1635b7..8b2e95158ebc 100644 --- a/sys/netinet/sctputil.c +++ b/sys/netinet/sctputil.c @@ -4115,7 +4115,7 @@ sctp_ulp_notify(uint32_t notification, struct sctp_tcb *stcb, sctp_notify_adaptation_layer(stcb, so_locked); } if (stcb->asoc.auth_supported == 0) { - sctp_ulp_notify(SCTP_NOTIFY_NO_PEER_AUTH, stcb, 0, NULL, so_locked); + sctp_notify_authentication(stcb, SCTP_AUTH_NO_AUTH, 0, so_locked); } break; case SCTP_NOTIFY_ASSOC_DOWN: @@ -4180,7 +4180,7 @@ sctp_ulp_notify(uint32_t notification, struct sctp_tcb *stcb, case SCTP_NOTIFY_ASSOC_RESTART: sctp_notify_assoc_change(SCTP_RESTART, stcb, error, NULL, false, false, so_locked); if (stcb->asoc.auth_supported == 0) { - sctp_ulp_notify(SCTP_NOTIFY_NO_PEER_AUTH, stcb, 0, NULL, so_locked); + sctp_notify_authentication(stcb, SCTP_AUTH_NO_AUTH, 0, so_locked); } break; case SCTP_NOTIFY_STR_RESET_SEND: