From nobody Mon Jul 6 21:38:37 2026 X-Original-To: dev-commits-src-main@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 4gvHmF44Tmz6kFyf for ; Mon, 06 Jul 2026 21:38:37 +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 4gvHmF3RBZz42SM for ; Mon, 06 Jul 2026 21:38:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1783373917; 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=JJinlMmCkazIeVTIQYaSczC7Mw2iaY7rgIC6O6Gi6IjvknML8Bpn6GFobyljMc1okcSA4A ZY5XabNNslmDei5+kPx4I7A7hPJSsbkgpVz+qG9v/XS0KLmRYvgKmN4StIKEiWSxXYv8U4 q3ddOECFjphmjtQi1f0rP2hQMrRnrKlNeQr3pITAh9fHIEYt4uuF3zehhKlvKJ2kIK2mTi 8/2HSl+pWeWiTg60hx8pgo3murfcEX9aUR5QjW/IwfTR30kMA7FMWXUbtFml03h3tocGSj d+ObcXrUaNztT2ox9ho24xtdUGgJZf9Djp560Muy+BYaMsQ9TKHLsmNO2etHnw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1783373917; a=rsa-sha256; cv=none; b=wVd6OcBg61N8Wy1BMDsG9A2Nil6e8i2t2QIX99/DFi1tKJx5Fhlu/jHphy+h6r/pDzVCT3 mtPUotonJHnMJldQwWrnjiQyCJim2Qk1EogrTggcyzY9ivb5LuLqJQzTJ+ecmjiUaYxc/q Z9X606mjFPoTr60dV0w6FT7YE2WW/3iHwZcjMr4+16ORvMk084HU9VId5rn/2EIEb9z/Do 0IkfJ8uOkeBL0rilzUe+26TpU2pgEDQjXHUBs/DeBe5vxpiILXDZCcghPzd9IVnAR6w5Tw jsGJMn9fJNYB3O8pPrmZfnF+DHoYYUjLwriamKGVPx+ElJMyPiFpfp27bmOAvQ== 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=1783373917; 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=TV3vGaWobmZhn1JArAIp0Xk+QgckJKroE6oXByBXBJ2HQXPuRjiLSpzLktIaFLYr3ifgS6 NIUyZmp4lnuyWxqtQdMh0Jx4YH08pkO3JrB7yy0ftof1ktvZL0JQLba+TDTU97xWEX9NQL Xa4Q/jaJqTfaUNfbNKhJH67f6DIXZ+8Qjof70Qk9J0fK1V4gZaJFEfzdLKRmdw4NkWgcTI UaIsTy2BBCV/WZhj0fBbBDCz035WTMljtr5JugeXuGVg+Hc6kp8ZsNSWg4EgrfSP/VzaiY AAMjRdcPKHjOtQvjO5o/MuAxRc7YS8+NENxMP7n9bj/YzTTQyJkZ6kgd/9GtZA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gvHmF20rDz1LLL for ; Mon, 06 Jul 2026 21:38:37 +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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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;