From nobody Mon Apr 7 12:51:44 2025 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 4ZWTcJ5K9zz5tDg5; Mon, 07 Apr 2025 12:51:44 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZWTcJ4Zzfz46kB; Mon, 07 Apr 2025 12:51:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1744030304; 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=OsUe9Yv8yYHb6OP4898H/N8diAkMBOGI9gKpJ+JmE2s=; b=Ytm+yWrXvYh/0nWyhruzYDt/gtslQGK4a2QZsxiy4mlkrWZowMqcmPCr3VvIbtktzwadpS +zMtf6PbzvJrSf1JgvI7/rPDxdld7V5bJp9dy32NlrOE1BuuNu/Be6ajlODxqN6i/3IVzu JRiUpZsT4xlPg7Lo65yxvHXQiXwrsoOyzkfT0hzoVo45sVubTLW9Z/D1T8gChlllGzz0V7 KlZwkRK3JMoPCwR0B3bkCGTYWtqOILcUy2F3VtuQazDx6zxH3ALpqcwKkS0BDaQ1kbnv+H vh+UfaSeKUjtwbERHYG2xQD/GUbtFv0Xopivxe2AKTBUzNH72FlF42/dtfpdbg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1744030304; a=rsa-sha256; cv=none; b=vFyaqz5iIyQ/DP0hrWdgGzWVX6GLUnwJRGOKAUVJrK4wRW2x0/A1WjyAcDdt5ktiTkkoyU /gryOThMgORVdRsVIHl/E/PvG/1qymJeOUQi1JIyJQ7qhdufn5otrQQL5E4Jo2xGb0VPKG 8mngVYQXENPAzTA0SWnE6oLswYpo55xoPWAt3JGEbVWJ15h5kjjW9WF1TeFH0Cc7RPzyNT zfpqwmQ0jeqPkMN8pZxluOi+2xbRIrhCE7uEWDWZFt7yNPUK5Lm7XgzKYb8/ZMzgWXpkV/ WJL3Yv5+6TitPql8/h6O58kp/OJvQkxezq8FcuAVSCUazVbI727byX0+DdsBvw== 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=1744030304; 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=OsUe9Yv8yYHb6OP4898H/N8diAkMBOGI9gKpJ+JmE2s=; b=qSOtEYNmBKaqMUPSm25YPOwnS2wHYTNCG6hiXoyuIUUf3KgfcYRIRF4Jgdc+ycrH1s9r3D MyuKWMiZLQ39NeKz4kVbrHeSNp5hUreSct19b8jXT7I4nU0KPPatJUIN4gzNUAeZzauXnC LFTx3eZAsdFSCK/OwUE7GZ45PSunrYFqhxDOMvytwo4AkJKe7iVANCKk5/9zIlv+PrFZo3 PAjOyV8PDduH+bI/S2wx4d8FNGYTHAldJ+VaOTotf+Nf1e6nqd3tOsdwAe7T5JBRZLTHrm Aqe1hqpzzGs226N2Pr0e/M3yX2zeJe8rHx8rv+GKzo8ruHHvD0w80IxrlshVLg== 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 4ZWTcJ3vDFznM1; Mon, 07 Apr 2025 12:51:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 537CpiNV048457; Mon, 7 Apr 2025 12:51:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 537Cpi38048454; Mon, 7 Apr 2025 12:51:44 GMT (envelope-from git) Date: Mon, 7 Apr 2025 12:51:44 GMT Message-Id: <202504071251.537Cpi38048454@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: 47c7dcfe2b09 - stable/14 - sctp: fix double unlock in case adding a remote address fails 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 47c7dcfe2b09a531ad618d962c62c6f84a446d3b Auto-Submitted: auto-generated The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=47c7dcfe2b09a531ad618d962c62c6f84a446d3b commit 47c7dcfe2b09a531ad618d962c62c6f84a446d3b Author: Michael Tuexen AuthorDate: 2025-03-31 01:25:53 +0000 Commit: Michael Tuexen CommitDate: 2025-04-07 12:51:00 +0000 sctp: fix double unlock in case adding a remote address fails Thanks to glebius@ for pointing to the problem. Reported by: syzbot+1d5c164f1c10de84ad8a@syzkaller.appspotmail.com Fixes: 2d5c48eccd9f ("sctp: Tighten up locking around sctp_aloc_assoc()") (cherry picked from commit e8623834ca29b562687db945bdd12a3e2fe4aeb1) --- sys/netinet/sctp_pcb.c | 1 - 1 file changed, 1 deletion(-) diff --git a/sys/netinet/sctp_pcb.c b/sys/netinet/sctp_pcb.c index 7f10784ce433..6b4f1ce883d3 100644 --- a/sys/netinet/sctp_pcb.c +++ b/sys/netinet/sctp_pcb.c @@ -4233,7 +4233,6 @@ sctp_aloc_assoc_locked(struct sctp_inpcb *inp, struct sockaddr *firstaddr, LIST_REMOVE(stcb, sctp_asocs); LIST_REMOVE(stcb, sctp_tcbasocidhash); SCTP_ZONE_FREE(SCTP_BASE_INFO(ipi_zone_asoc), stcb); - SCTP_INP_WUNLOCK(inp); SCTP_LTRACE_ERR_RET(inp, NULL, NULL, SCTP_FROM_SCTP_PCB, ENOBUFS); *error = ENOBUFS; return (NULL);