From nobody Fri Sep 15 17:45:17 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 4RnM654Ggjz4tRnL; Fri, 15 Sep 2023 17:45:17 +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 4RnM653nJJz3K4y; Fri, 15 Sep 2023 17:45:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694799917; 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=DImp89lFD1P48uNi3rgrWUON+MgdSqWIam2evXi935Y=; b=g8KCOG+Lksl2/MN3MGq+tqq/VUOPj2DzL72odHRhA9DI8OveuZrCYeNNgGP4Y6wDx+VMCi Kvwmy5Cv2T7n/i8u67eJZauynHRs9NHTgIMFK62BgJF+VxHjgALKu+Luu48KWWRs5RMa85 nWh4s8z8HWjP0o/PR9kNG6a7QKJcXwcmaSkXpAzJlKi4vtNKlFS7Ic3qX/8CmVvG0xsJmf JtSbc9WqFZIW7FOZKId0BysPCtjOulB+QxG7i0hmB2dK1VrO3FWPk3fXk0+AlHDJPC2+1S PFR+PuFhVmIYDqNag/jFXPtw1oezTjukrLHF//9j0tPSboB+Yy+Oa3z07O4TZQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694799917; a=rsa-sha256; cv=none; b=kqY9SnJlgnM5fAUduGyUCk1TL+XUOa3TB78yef2f5woXsQkIpZptK2d180Bz4Po5PqzRtd N5wRw5Y5euazaL0AmjmYkG1G/7Qq0Rl5LipFlMXQfKT+3o49FnW+WVXqXff/9lCW9xVqw7 /nQV32kIW6Uu8o+K5IfJ1arddH/ATD7K2dyY4NIGsYuCnlzz/0Jo9wtehrUi6BEnhb92Xj tAumM6askU1isTQf36KgjjkoOKbdmZDKtIIj5NVASGOA/PAU/DMimKFpCggbN7Syz7T+IH eDFj5i/8vLj3YXt+YTObOtGrUKtjKqJBVpTuWd49Q8AhXAhrhUUw5gw6JfZybA== 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=1694799917; 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=DImp89lFD1P48uNi3rgrWUON+MgdSqWIam2evXi935Y=; b=lcHPe8qBhm7xHJKHU3LkqEriDWPwZRoe/5Gi8OJWGiNjgsM3lBd5hD8PLsUn5+WeoxcQHo U57NgLbDEH9ZrUXyjGe/OJL+sgHar8Efy06kOHrI0Ot9wT8R3dj4qSYpr1i8HmbBcRRCrW EpXbApwFwpomc5DfR76bqmDw36tdbeA55R36GpEQvSiQU9qbywMvDvjbafiu6xYP2N+jlD 0fxh+lUeAxsrWYUveRFsGinnJV9APGZwi/nU2+Mw0RvIWrKKPqPyPWOXaYcRHmRPhY0qhi p/iOv4pzHDgAUjPBKV1jGGVOXERDMIIGK0BM8OrXZthvHTTyHBgn/okStmRUPg== 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 4RnM652rPvzYhm; Fri, 15 Sep 2023 17:45:17 +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 38FHjHYE056539; Fri, 15 Sep 2023 17:45:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38FHjHjZ056536; Fri, 15 Sep 2023 17:45:17 GMT (envelope-from git) Date: Fri, 15 Sep 2023 17:45:17 GMT Message-Id: <202309151745.38FHjHjZ056536@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: 78e5017cbe52 - stable/14 - 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/14 X-Git-Reftype: branch X-Git-Commit: 78e5017cbe5228c8bef7a2d3c48a95e565eeefc8 Auto-Submitted: auto-generated The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=78e5017cbe5228c8bef7a2d3c48a95e565eeefc8 commit 78e5017cbe5228c8bef7a2d3c48a95e565eeefc8 Author: Michael Tuexen AuthorDate: 2023-09-08 19:19:59 +0000 Commit: Michael Tuexen CommitDate: 2023-09-15 17:43:30 +0000 sctp: don't call sctp_ulp_notify() recursively This does not work with the new locking scheme. --- 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: