From nobody Mon Jul 6 21:38:37 2026 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 4gvHmL4CXfz6kG8V for ; Mon, 06 Jul 2026 21:38:42 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gvHmL3lgQz42YZ for ; Mon, 06 Jul 2026 21:38:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1783373922; 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=gU/lGdmTmX9de6er9S53Zt75bF3OWntdlIzZc6NEqV4=; b=M+WjT7sKvDxMYUzdAg3fS+YIRldO4m9KEP0hOAmYX4MySWpxG6NKmAaUKFab3KkQw62evx B5A4VpzSxEZqzLbvyOPcKX1S0esPpee2hnbnWMnfqPGahoShE36cGt2Qsb0aQ6JXv+Kmkj 9Jf4AE7ll2HYeFlqoTRq5IK9kTwi0QY8xRLjzdFMBCjLJcYbE/8KyEtuY+QKIprF4Os6JU nnd5Nj5wsAd3bJC504oNiAIHImScBGVAwHWmK77hHT5vSMCRjCuzcZJ8UxRnr2NH1YCN+M Y7JTQ2WMUwem8RamqtEkA93dZ4LyBPg0I4s0jc1Wp8pfeFGnaio409N2dgqizA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1783373922; a=rsa-sha256; cv=none; b=D1CG68nCH/2P0w86vOD4ymE8AZZ5ChOv67fVCYX0H+BdMecU0PJpTRPuVO0NjeuDqt8kD3 2vmkInE7M7PqYouodKDpo1iO+gQZSZtHhB2YQghLMr00b+MManMhy6SaBahp/VAD+Lz9az rD+lDHaxnmm41QPIYZeK5ye9tqUBMHsx1X9Y0fWTI9xSmJUOU3e/XW40HV07nMEtlrrNqv s+zi5+UWFpCUyzU7DQtVyh4qUyQVF79byTHHaaHX5SArL4HQKgxuSM3ow+7vX/FSXZylVI W1xdFUByRinVmxhnpKZmRe3uFrx4vc/lilL4ze01DDvJ9I75GSfNt3+qPfrBXw== 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=1783373922; 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=gU/lGdmTmX9de6er9S53Zt75bF3OWntdlIzZc6NEqV4=; b=AQJld4q8gDXPRTNR6/j8UR+2fgQkGGYo7CeJChGuRFJkHokbC99atGbuMH94+nTx3teqnu vhKRwknwkQg//VyVY7dYrSoZf6zBML5yjr0WQh8VjsWSiDrgBjAKR8yBy3wPAzK884h+h7 +xOMKP6KJ/fFVVjaf7BoO2/R+yJ2Ma9hUIzg6WU6MC/AgYqj3vGCkAZhc6M4jLuP+2a0KY KaocmN60t/laJoppR+bgzj90NYPrV3n1n434XWpAsB3lRHQ7k3HgGlqmekUGPBFmogWths W+ejjLgSFTHyVd9twP79+hqW6xRjxpC9O9pY6mFQWAa5UiVCVMSVM6tysW5G0g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gvHmL2WqYz1LQQ for ; Mon, 06 Jul 2026 21:38:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1bfbb by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 06 Jul 2026 21:38:37 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: ee5d87a3e2ca - main - raw ip: fix race of two connect(2) 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ee5d87a3e2ca1c169ca2032fcb12841a499356c9 Auto-Submitted: auto-generated Date: Mon, 06 Jul 2026 21:38:37 +0000 Message-Id: <6a4c205d.1bfbb.2475fabb@gitrepo.freebsd.org> The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=ee5d87a3e2ca1c169ca2032fcb12841a499356c9 commit ee5d87a3e2ca1c169ca2032fcb12841a499356c9 Author: Gleb Smirnoff AuthorDate: 2026-07-06 21:30:41 +0000 Commit: Gleb Smirnoff CommitDate: 2026-07-06 21:30:41 +0000 raw ip: fix race of two connect(2) The historical design of sockets is that on a re-connect the disconnect is performed at the socket layer in soconnectat(). Since SMP times this is known to be racy and the function has appopriate comment. I missed that in the recent change. The pr_connect method should normally expect the socket to be already disconnected, however should be able to handle a race where socket is actually connected. Convert the check that incorrectly tried to handle normal path of re-connect into check that handles the race. Reported by: markj Fixes: ece716c5d34728a170f1dfe1b3389c267d6ddd1e --- sys/netinet/raw_ip.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sys/netinet/raw_ip.c b/sys/netinet/raw_ip.c index 851f70cbb0ad..67e798ccad54 100644 --- a/sys/netinet/raw_ip.c +++ b/sys/netinet/raw_ip.c @@ -904,8 +904,7 @@ rip_connect(struct socket *so, struct sockaddr *nam, struct thread *td) KASSERT(inp != NULL, ("rip_connect: inp == NULL")); INP_WLOCK(inp); - if (inp->inp_faddr.s_addr != INADDR_ANY && - addr->sin_addr.s_addr == INADDR_ANY) + if (__predict_false(inp->inp_faddr.s_addr != INADDR_ANY)) rip_dodisconnect(inp, false); if (addr->sin_addr.s_addr != INADDR_ANY) { inp->inp_faddr = addr->sin_addr;