From nobody Fri Jun 23 15:09:56 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 4Qngdd0Mg3z4gjjX; Fri, 23 Jun 2023 15:09: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 4Qngdc71Xrz3Pgy; Fri, 23 Jun 2023 15:09:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687532997; 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=/Fsj1oBtsFzUzes5QdPSlYeBV80V4ut5Ecc9jHAmHMg=; b=W3Z6uqaVFBUx9+xwLXcV1kJnLDPf7Dh+lgENG6hF+uan8elSTrZNJgY7mPFB3B2B4WSyEc 7ThjlOCnca/rEw6y04rMayHmemK+ZuXjeUtFBNeu0Ytm4a+c9wmZ5EzVx8ZxGN6bs0QASB X9j7vhdH5pEnoTkIZBfe4+95buYy1YAm6Rxn38Evr4YvYMtgGuC4VbuFOM1cZ1kD1qU37I KIPCoXUviLJH/+4yRmuRRHhgxQm2ZFjs3FH9eCW0bmijWsnIPPCXk7AmMiPexruZQ9TOV8 ySoUJ4+JsChHYOBmYBYaVoBZaEygp6IKBvNef17CowITZIBkx/iHfFd/VjfDcg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687532997; 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=/Fsj1oBtsFzUzes5QdPSlYeBV80V4ut5Ecc9jHAmHMg=; b=rs18IN8abstdhAQEspzM7hFE9Xt2ynK8NelVnd6G02miehh7DmiL+Lf0/cg8hOj+euejqv 6OGlY7/Vd1LiED2GnQQeMlHtC/YtlIWlS/3Dqsc0x9VuAf0MvbYzUBnnGdYIs+ukYILMUt CX12BhTXxQpkV06TDfie3Qolsb+kogFLEOLj92OkQQgn+D47G/0Nl16F/IYqKYSKw265FA V2XEuTjV8/0hcpwqvHbw08SEbYQ447+UECyHvCtJiGN01dQQF6Fgbogwid6spqJUiUZLUd yiGfKBUXtX1drIu80rEQZRN6ACpJLlMvUegwBTMV4g0E7xJjyK57ja2CeUMhqQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687532997; a=rsa-sha256; cv=none; b=hNm3wLsUM6Wq7nyk/j/kX6/VyFOwTyGU/ttFGOEr7OgE6qyOVvsV+jVDPCB7GJfqyyzrOk 8QsXZFEkrdu//St6D+EQnB5ABhaL205ZTMcKitWqHRwTbOuZGf0i9Owewsv0HzOUqIjlEm a1cDqT88HRpy/GToUQ8yqDFE1tWEGiHtGbVPJH2+ZQiuzOUqCRWXww5hb/cAccFVV7rDCL XFbjzzxvlobAl7DrzV8eUX0Js9QUEYyD2kz85wLlttv3x0Ev79vV4M/VhKMpQ6VMkMbZnN 1eRt65EIFodob+NcW/qR2yWStY4TkdVdy5VHqQApuuchKcDU3iXLyazIXWv2xA== 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 4Qngdc66Pqz17vr; Fri, 23 Jun 2023 15:09:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35NF9uqH037772; Fri, 23 Jun 2023 15:09:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35NF9uhx037771; Fri, 23 Jun 2023 15:09:56 GMT (envelope-from git) Date: Fri, 23 Jun 2023 15:09:56 GMT Message-Id: <202306231509.35NF9uhx037771@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: de0a2eb2ef86 - main - tcp: Disallow connecting a disconnected socket 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: de0a2eb2ef86f6c41157529b827da06f47190e8c Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=de0a2eb2ef86f6c41157529b827da06f47190e8c commit de0a2eb2ef86f6c41157529b827da06f47190e8c Author: Mark Johnston AuthorDate: 2023-06-23 13:59:52 +0000 Commit: Mark Johnston CommitDate: 2023-06-23 14:00:52 +0000 tcp: Disallow connecting a disconnected socket Currently nothing prevents tcp_usr_connect() from attempting to connect when the socket has been disconnected. At the moment, doing so triggers an assertion in in_pcbconnect() because inp_faddr is not unspecified. I believe this may have been caught in the past by TIMEWAIT checks, but those are now removed. Check for additional socket states in tcp_connect(). Reported by: syzbot+f0f7871ec5397602b446@syzkaller.appspotmail.com Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D40579 --- sys/netinet/tcp_usrreq.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/netinet/tcp_usrreq.c b/sys/netinet/tcp_usrreq.c index 629b47f04142..cd2263245b56 100644 --- a/sys/netinet/tcp_usrreq.c +++ b/sys/netinet/tcp_usrreq.c @@ -1464,7 +1464,8 @@ tcp_connect(struct tcpcb *tp, struct sockaddr_in *sin, struct thread *td) INP_WLOCK_ASSERT(inp); if (__predict_false((so->so_state & - (SS_ISCONNECTING | SS_ISCONNECTED)) != 0)) + (SS_ISCONNECTING | SS_ISCONNECTED | SS_ISDISCONNECTING | + SS_ISDISCONNECTED)) != 0)) return (EISCONN); INP_HASH_WLOCK(&V_tcbinfo);