From nobody Fri Sep 8 19:20:57 2023 X-Original-To: dev-commits-src-main@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 4Rj5Yj2XX0z4sqRc; Fri, 8 Sep 2023 19:20:57 +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 4Rj5Yj20yCz4GwQ; Fri, 8 Sep 2023 19:20:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694200857; 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=3Mb+Tq+myoHeJRR9NyuRC9J6K7jROW/0eK+ecyO9PUQ=; b=Xs8GZy32j7zAEV01U//W8y3AHzjnA82VO33ujlrZ+H2pC99+JESAF4wNTJNcgB5y2IWbyL fRjvD8XfGuCMorjRBgq7A9BnaNobV5yfA+yw1FLhDBSwWPOlsXX/+supqyc9BToFgSmTNa Co7cCW7EYu1X8kBfkXtGQkNPWK33qX0BPqTcqhimDskR9iGLkUnLGg1hiEMW6ID1Q6e0ik mX4pHo212XafyMlWRT0odgaJ0O/3lTZs45gz+cgz+MK6ymKbPe39jIKmIxLTGqxlivKF/i 9mkll5kOXCTnxbE0XoaIUPZoDzN9EEguAfKoEGFPwiLoJryfI4Zn2gw45pt9sA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694200857; a=rsa-sha256; cv=none; b=uTN2aRDrgN1EfeazSsWIiebZarl4HpfsukNXux/w7Nc5PqvI50Qkj3kWWaiHrE0aa6pAWR WxHtUMvx9Yk382IdqK5fteJLJ3x2sidrRrIVm/592QF70gP1UJOZhi6zOdtyn3hf8oeK2H 4mqH0z10JLGByOaCm5KDusMwf7clKEJuv62QYI0PCG7e+fq/0GOQv5pulB3wjmt3FRrqNa zGXsvTgc7hda+A5PTJ4Bc4Z+g/oSy8pmel+lXkpRx0GKhnAX1G6hewsNm24bj6lFcid7t9 s09UOIr2DiSSq3TRvFu/y/w+o0GQbUSOpSZaO1G4go/I9rdd9AUrbTACrNPxyQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694200857; 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=3Mb+Tq+myoHeJRR9NyuRC9J6K7jROW/0eK+ecyO9PUQ=; b=GwzXShnvZA8Ne/HMfHofLJdovhjskcvn0NKvDsy8MUztnKSuRQ3O91ZBTdyQ4MBmlL16nl huzjR09t4GqVrqrboMpQ3sKfTzRcMLubpOV2VFwDA90Cc+VwiE/Yq2CK5Lr0tB8DpiWLsK DSf2EX6L/rVcm2bZAs8oO0KzEwetPSAdkRB8GVdNvnL5An+DeQPcnXYY1fSnkOoQD/ouOE 9CXAhxqa4PWobTxoGmY7qWUbDXNG7OTMD0JlOdCpxiU9wCXzOfARrXlsHMUJ+rTWIKe7LD 2VABLaJ39FFBSo19cxABzb/5u0a+IoSkVYmBNXNqy0KBcKFh4vObr4La22xhEA== 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 4Rj5Yj11VyztcH; Fri, 8 Sep 2023 19:20:57 +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 388JKvHg051240; Fri, 8 Sep 2023 19:20:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 388JKvr6051237; Fri, 8 Sep 2023 19:20:57 GMT (envelope-from git) Date: Fri, 8 Sep 2023 19:20:57 GMT Message-Id: <202309081920.388JKvr6051237@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: 1e81a4e7e89b - main - sctp: don't call sctp_ulp_notify() recursively List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: 1e81a4e7e89bb1870bec84e42284ad10505e957c Auto-Submitted: auto-generated The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=1e81a4e7e89bb1870bec84e42284ad10505e957c commit 1e81a4e7e89bb1870bec84e42284ad10505e957c Author: Michael Tuexen AuthorDate: 2023-09-08 19:19:59 +0000 Commit: Michael Tuexen CommitDate: 2023-09-08 19:19:59 +0000 sctp: don't call sctp_ulp_notify() recursively This does not work with the new locking scheme. MFC after: 3 days --- 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 11469236014e..19180b3cf725 100644 --- a/sys/netinet/sctputil.c +++ b/sys/netinet/sctputil.c @@ -4117,7 +4117,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: @@ -4182,7 +4182,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: