From nobody Tue Sep 03 14:55:08 2024 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 4WypZN6fwKz5TMt6; Tue, 03 Sep 2024 14:55:08 +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 4WypZN5LcTz4xKx; Tue, 3 Sep 2024 14:55:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1725375308; 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=nSnlzcc4T1QUCfsaSbWRi/cNeZ4D8n4SGaEXQ2UZmhQ=; b=V7ecBKzalCZQB0k8ccXiEPJrWhmQRxoRbr7YpvN32NpIMpHIjG2nFcXXEfDeodKNSXrFZ5 m2e5v7jNcCwc1pFuweN4W47U9GQLg4OIfVlrAaYJDOU7QGDhja+zoqGc4u523SX+sT7jhX 7KfDKiegFlax0r1R4+KjEiF7W46+SGn+AGlztJho+dnyvX5fsALeCqQRuHRWCv2Jl6ty5m gr4txlBkplJecOoXvldrog7a7rcjPESuEgf3oavfxGPbdKmcasNnpTqeDwWpSz+p4q8xN6 Xim7kBhPJPnklVflngb41eeq8NDrtin1PGXBh8Kbj0SFnNHHuayk5smQ5BrMrA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725375308; a=rsa-sha256; cv=none; b=TOvtqhwUNsprqgEn3SI4Ogn8ZP8hGs5OErlwcChsuulDl3WnEGvlFsbcNlntf2dFShqYyA jzPukUb7ak7gRJqO44G8VPQDnvouzdvl450WvBTUWdJ/m35z2VOEv4jQ/ySVUr+QDIvQHs hpxrWKBhiytE+py1a7yN+JRoY0bbZGA0XRxy86qNH814QnPmzFUf47cWDrzvjZOca4FznC 6nPWxODEss8UTBtZAPGCy1sQX4Xq7xJMsmUwfAM0wa/lCvy5viu1EUtCYdoX6/NibmavDi osCB5DGi3CIjbYiFKYl5KgK/1+kEAG4Y+wkS0uVNff8b+TDw82xHnkaJ3j2B7Q== 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=1725375308; 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=nSnlzcc4T1QUCfsaSbWRi/cNeZ4D8n4SGaEXQ2UZmhQ=; b=B4oaeJhpKFJD+1911CZLodu0jX4KPgu6wOuPXy+b4xsxC+Ly7g2OxVu2aj+Y1mQ8AAjcJv c0FASA+FIhxOmuGGb+96/1P/4W3HXqzoFktMsLqmyXguIRBZOqqn9Iu/dv8wIfWyZ4BW3I WvG+i2g46wCEGGGKlsdubENx6k82u4duX58O3AJo1kaHW7a6IGUYotD2JjtSiA8TA189a0 ikJBAGi9Ps7qBlZakx2QT2WGSwkCZKaywPKG7mLiLnqq8vpnCxhMwtb+7JD7KnVeL1c2ON etPn0iabexniB9Y4c6Z7B4+FDtVnfLSVcnuyNA9O7f4qSBxCXbILq/k6bbLsxA== 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 4WypZN4qqfzlrD; Tue, 3 Sep 2024 14:55:08 +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 483Et8Zl071010; Tue, 3 Sep 2024 14:55:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 483Et8eu071007; Tue, 3 Sep 2024 14:55:08 GMT (envelope-from git) Date: Tue, 3 Sep 2024 14:55:08 GMT Message-Id: <202409031455.483Et8eu071007@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: 1c8e1e50f009 - stable/14 - socket: Set lock flags properly 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 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: 1c8e1e50f0097d202f42d0fc3b2080d09ac9ae92 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=1c8e1e50f0097d202f42d0fc3b2080d09ac9ae92 commit 1c8e1e50f0097d202f42d0fc3b2080d09ac9ae92 Author: Mark Johnston AuthorDate: 2024-08-20 14:52:02 +0000 Commit: Mark Johnston CommitDate: 2024-09-03 14:54:43 +0000 socket: Set lock flags properly Fixes: fb901935f257 ("socket: Split up sosend_generic()") Reported by: cy Sponsored by: Klara, Inc. Sponsored by: Stormshield (cherry picked from commit 66aed7e3488aa60195abcf846da5e04aa82fb1bf) --- sys/kern/uipc_socket.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/kern/uipc_socket.c b/sys/kern/uipc_socket.c index adb11e08a7ac..cdff5f23de0a 100644 --- a/sys/kern/uipc_socket.c +++ b/sys/kern/uipc_socket.c @@ -1866,7 +1866,7 @@ sosend_generic(struct socket *so, struct sockaddr *addr, struct uio *uio, { int error; - error = SOCK_IO_SEND_LOCK(so, 0); + error = SOCK_IO_SEND_LOCK(so, SBLOCKWAIT(flags)); if (error) return (error); error = sosend_generic_locked(so, addr, uio, top, control, flags, td);