From nobody Tue Aug 20 15:17:32 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 4WpCkj3CSXz5TJG0; Tue, 20 Aug 2024 15:17:33 +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 4WpCkj14wlz40lR; Tue, 20 Aug 2024 15:17:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1724167053; 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=mMw+kFAFF/oI0UMT97j7WiH3m1HCkgGb10GEVHRSaYw=; b=pkQsNPGjuT7MjcWTMMeT6aQocGfIcVOpjZl918htpwTKISBRc6coXdCZpBNsrkymHkKFTN QI7M0YIYymRieXX2tVjlfEB8w8TgzhwU6cr9oYwvaNlaW2zaqxpvIEC2lUj/u0ugtJYVbi fdNj1r+gppMEU/ZaVhR4LV0O2htn48I1eEPJSXXobEhvrIOEioM6XGL9BkbriaUgdJ+cBk KW4hXwfnJmek+T6P4JcNF5lQiacew3EKQIMbh7uYq5z8TvdgpNUZ+VqpUbMePwOETcQH45 /XRgCbN8xLE4sWZsxMxdqW3J4IysoVlP95YnHvTx1zUj2Q2NQf2PlWLhZKPEjw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1724167053; a=rsa-sha256; cv=none; b=kzXcj/0eKPeQb969hKjS4PhryQ8YdCxtYDMnP3lneeHFYDKDhhu4KQeL6qAoKFd1Bg+3Mb iWiRh2j53V2A2H/baNajw3vcgzqaFbc7JDvlfOhBG1SPJV/OrpBKCVcSgp+Li3QnZAsDGC 1365BhSYO3LF7sFhdRHd4GISCP3VW/NYsKeGBVx4763mRzFCBwfe+C0ktLMEreXRjP1U5D P/LWAFFzC+o+DyBufauKKvX5o+1Ua7x5EARakbKU7zeqikmhcffdE2va8FiPwQ1M7X6X6q 4LN4HLSixvWSDEJFR9T4bJ8DNzThLt+BI7MwQVA4tKVNLTgHshVul3MBroOgng== 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=1724167053; 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=mMw+kFAFF/oI0UMT97j7WiH3m1HCkgGb10GEVHRSaYw=; b=no1ZTfMU7uFAZlMiMryLLZksWMWsZTgK2q1rO/gccnOiXmUCIj6gYkfYSt+8KkWzpH1Ogf +kpecN2zT8OwFKEk3qbjNHnvkM2vVMSw8EYvLAvcdKqUisPdcntgG02d9mCTcTJYAZD5Sz /B3TvYPrCvVY/j2uFFoVK58lncXpPldPFTv3u4+mXmac0bUSN4QyT+Xaqj6gUhq9c+h1sD cJQ9hOQkY0HFIvi+fd76Lk1jinPiXO6bPbG/HNF4IJW0wt3sZDAnXZ/G4Ymb+ZaI1oFypn zC8ObYyjFA3slcfOnXSxzb90DaEpidHbiCSiUy0+OAxg0hxxMKFKif6WpEZ6hw== 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 4WpCkj0cGCz14mb; Tue, 20 Aug 2024 15:17:33 +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 47KFHWGV011067; Tue, 20 Aug 2024 15:17:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 47KFHWvJ011064; Tue, 20 Aug 2024 15:17:32 GMT (envelope-from git) Date: Tue, 20 Aug 2024 15:17:32 GMT Message-Id: <202408201517.47KFHWvJ011064@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: 66aed7e3488a - main - 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/main X-Git-Reftype: branch X-Git-Commit: 66aed7e3488aa60195abcf846da5e04aa82fb1bf Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=66aed7e3488aa60195abcf846da5e04aa82fb1bf commit 66aed7e3488aa60195abcf846da5e04aa82fb1bf Author: Mark Johnston AuthorDate: 2024-08-20 14:52:02 +0000 Commit: Mark Johnston CommitDate: 2024-08-20 15:17:14 +0000 socket: Set lock flags properly Fixes: fb901935f257 ("socket: Split up sosend_generic()") Reported by: cy Sponsored by: Klara, Inc. Sponsored by: Stormshield --- 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 13b6253bd115..42c43539b484 100644 --- a/sys/kern/uipc_socket.c +++ b/sys/kern/uipc_socket.c @@ -1920,7 +1920,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);