From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id DCA231DED4E; Tue, 8 Oct 2024 13:10:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728393051; cv=none; b=mwoS8suMfTd7cU6C07trZ3I9ZKRv5pkF57Jxqa1ZmExkfu+cEwRCDxcbqa8AFt36suWOKmddLMmTao1nmxcU3OU7JLC2ZorJgVFj3CgL6roBuryAnpj0tGum28+rPGz9vEcWcjCswFEeK7gpFWBKCb+1Siv9hnc91g0FABwUM9U= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728393051; c=relaxed/simple; bh=pP9ReGJ3Wcn8fRakjKEGhILCNiNugAa3rPu4W7iiv4E=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=WOS7iKeAi8tgMK6xSwYNtLcTPOcnpe0Biiazt3B81Fe9FMPQVvnjHDSmLMQ/jLzHdTnc4XIS//nxYcUFW0zk3j0oSIqw9IN1Z9J5pmdEfZq6tTfzGufKwGI2uQYw44h+SPYs8plZPqomxQBtJfC3DUeTt5bu2cjMqfgKm9xTGYI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=1tVCOlNx; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="1tVCOlNx" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0E8D0C4CEC7; Tue, 8 Oct 2024 13:10:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1728393050; bh=pP9ReGJ3Wcn8fRakjKEGhILCNiNugAa3rPu4W7iiv4E=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=1tVCOlNxBde+IxrruMVmnO7qqBabTMuQ6CZFvmhzceFOZYOiF0ENUEMW2rnaOFXp7 nqYHrmWDs1QQrXDrPpelA2PT0mOSLX2zXP5e2wD5WyKjr0alFRqZ2U7LAZWjlO8AXD t7YvlF1SrMccVOXCGKEA7dEz8Q96TeGE1kUkWO+8= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, syzbot+f4e0f821e3a3b7cee51d@syzkaller.appspotmail.com, Xin Long , Marcelo Ricardo Leitner , Paolo Abeni , Sasha Levin Subject: [PATCH 6.6 038/386] sctp: set sk_state back to CLOSED if autobind fails in sctp_listen_start Date: Tue, 8 Oct 2024 14:04:43 +0200 Message-ID: <20241008115630.973844156@linuxfoundation.org> X-Mailer: git-send-email 2.46.2 In-Reply-To: <20241008115629.309157387@linuxfoundation.org> References: <20241008115629.309157387@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.6-stable review patch. If anyone has any objections, please let me know. ------------------ From: Xin Long [ Upstream commit 8beee4d8dee76b67c75dc91fd8185d91e845c160 ] In sctp_listen_start() invoked by sctp_inet_listen(), it should set the sk_state back to CLOSED if sctp_autobind() fails due to whatever reason. Otherwise, next time when calling sctp_inet_listen(), if sctp_sk(sk)->reuse is already set via setsockopt(SCTP_REUSE_PORT), sctp_sk(sk)->bind_hash will be dereferenced as sk_state is LISTENING, which causes a crash as bind_hash is NULL. KASAN: null-ptr-deref in range [0x0000000000000000-0x0000000000000007] RIP: 0010:sctp_inet_listen+0x7f0/0xa20 net/sctp/socket.c:8617 Call Trace: __sys_listen_socket net/socket.c:1883 [inline] __sys_listen+0x1b7/0x230 net/socket.c:1894 __do_sys_listen net/socket.c:1902 [inline] Fixes: 5e8f3f703ae4 ("sctp: simplify sctp listening code") Reported-by: syzbot+f4e0f821e3a3b7cee51d@syzkaller.appspotmail.com Signed-off-by: Xin Long Acked-by: Marcelo Ricardo Leitner Link: https://patch.msgid.link/a93e655b3c153dc8945d7a812e6d8ab0d52b7aa0.1727729391.git.lucien.xin@gmail.com Signed-off-by: Paolo Abeni Signed-off-by: Sasha Levin --- net/sctp/socket.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/net/sctp/socket.c b/net/sctp/socket.c index 225dfacfd233f..4a1ebe46d045d 100644 --- a/net/sctp/socket.c +++ b/net/sctp/socket.c @@ -8551,8 +8551,10 @@ static int sctp_listen_start(struct sock *sk, int backlog) */ inet_sk_set_state(sk, SCTP_SS_LISTENING); if (!ep->base.bind_addr.port) { - if (sctp_autobind(sk)) + if (sctp_autobind(sk)) { + inet_sk_set_state(sk, SCTP_SS_CLOSED); return -EAGAIN; + } } else { if (sctp_get_port(sk, inet_sk(sk)->inet_num)) { inet_sk_set_state(sk, SCTP_SS_CLOSED); -- 2.43.0