From nobody Tue Aug 20 14:05:30 2024 X-Original-To: dev-commits-src-branches@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 4WpB7b0851z5TBSN; Tue, 20 Aug 2024 14:05:31 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WpB7Z6lDyz4gHr; Tue, 20 Aug 2024 14:05:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1724162730; 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=/IXQLn/7IaTK1SuK5Z3IzkqiL/hBFYEF9Njypf7iXHA=; b=XTh9ynp5yVRfdNSvtJN9HAw6nskUIAM2aHIzhurb6SPRFR1tYvJ9Ni2r6RtDiBzMrx2my+ WmxJBnuuub+b7RcacAf9Rw3Ijo+fX1U4AHQbIcDoQZ9I6/+5tQmhR/byQ8zfZMH1KKafGE GzOkgtuGyMFOgnwsMRLO1bucnjhlcvolqpBbNJpEO4is4XJJkQlBo+Js1BmeEcrOyCDqPc kWL/T+vQhkU6EOg8M+bn6HPRw1tJs8Zi72qP8zX7zEZVm1Q7M4dmFyZkrV3Xd5+D6p5YqP w37JzgugpS4GAceLDxHrcf1udxlcFF4HHdP8GVPXQa1lOAuR8RHMOHWv9NuwnA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1724162730; a=rsa-sha256; cv=none; b=lgDNKV8HQEmOlV41iW6Lk04+cKaC1+B7oA4SSkt10bLFoWku5TwegHlTge+dnphW/ZvZoi V9GT71qldaXWMYRQvf+b01EdYxCVcgp/vBOk40uiJdZKZ9ynK7pXb4MlhI5zosKZMT4Dhq PQs+am03Q8ZqYheKyjzDT5+7l/kMAVODG+kPbNc8sAqM1F0XBI1wrhf5nd+bj9w9cp4xuJ aG11hcCY61qFWv/CdrnVBr0zRZ65CvClu1P9Kh/8uOkH2R4eAhujoA7qXoa6601l/y0k0v 9suvixIAmDKeXmwH20v5ezCR4n4jrg7jFxB6I3Gpg+VsFDP8v0fxjMyFIOMT3g== 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=1724162730; 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=/IXQLn/7IaTK1SuK5Z3IzkqiL/hBFYEF9Njypf7iXHA=; b=mLXSQnH4bGU9PKi5YEyRalgQk46P6RhF2IVeRzsQKFOVdCjT0pkSawJw5KzPcyoydstt1z 0WJ/LI58Jhn7pIUxvGhO3dx7fu+fkrS2Ycch8Ei/4Tv+zv78x+Izt/K+gWcvi1u9WaKUji sAA9/vgMxKwDpus5zjxoxxThtahAWKJSN2NcxCsQ5aP5Zf+Gl3fhx9ju7uZXV82+OvOUad mDkH1WwsQgUVnr1K8zI6LyeuTw3sXbgxnx+U7+z5dqGHnIOQ59NslXyOLtYQMscc9bqn90 oiF3N1rOvaS/qkBxOwrgI+lB8MYpIjnM7rOzMPEEwjkr3PZq/9YtkxeFPfm8Zw== 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 4WpB7Z6Lfxz13Mr; Tue, 20 Aug 2024 14:05:30 +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 47KE5UG2091089; Tue, 20 Aug 2024 14:05:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 47KE5U6T091086; Tue, 20 Aug 2024 14:05:30 GMT (envelope-from git) Date: Tue, 20 Aug 2024 14:05:30 GMT Message-Id: <202408201405.47KE5U6T091086@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: b2cc25c8fb0c - stable/14 - socket: Fix handling of listening sockets in sotoxsocket() List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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/stable/14 X-Git-Reftype: branch X-Git-Commit: b2cc25c8fb0c0ff71682c28665d11f65bca2cc91 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=b2cc25c8fb0c0ff71682c28665d11f65bca2cc91 commit b2cc25c8fb0c0ff71682c28665d11f65bca2cc91 Author: Mark Johnston AuthorDate: 2024-07-09 20:28:12 +0000 Commit: Mark Johnston CommitDate: 2024-08-20 13:22:56 +0000 socket: Fix handling of listening sockets in sotoxsocket() A lock needs to be held to ensure that the socket does not become a listening socket while sotoxsocket() is loading fields from the socket buffers, as the memory backing the socket buffers is repurposed when transitioning to a listening socket. MFC after: 1 week Sponsored by: Klara, Inc. Sponsored by: Stormshield (cherry picked from commit fc4365853f1c4b572d9fd643ea336508d9a6a0f7) --- sys/kern/uipc_socket.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/kern/uipc_socket.c b/sys/kern/uipc_socket.c index 479184a87a5e..7801054315ef 100644 --- a/sys/kern/uipc_socket.c +++ b/sys/kern/uipc_socket.c @@ -4264,6 +4264,7 @@ sotoxsocket(struct socket *so, struct xsocket *xso) xso->so_error = so->so_error; xso->so_uid = so->so_cred->cr_uid; xso->so_pgid = so->so_sigio ? so->so_sigio->sio_pgid : 0; + SOCK_LOCK(so); if (SOLISTENING(so)) { xso->so_qlen = so->sol_qlen; xso->so_incqlen = so->sol_incqlen; @@ -4276,6 +4277,7 @@ sotoxsocket(struct socket *so, struct xsocket *xso) sbtoxsockbuf(&so->so_snd, &xso->so_snd); sbtoxsockbuf(&so->so_rcv, &xso->so_rcv); } + SOCK_UNLOCK(so); } struct sockbuf *