Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 3 Sep 2024 14:55:08 GMT
From:      Mark Johnston <markj@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org
Subject:   git: 1c8e1e50f009 - stable/14 - socket: Set lock flags properly
Message-ID:  <202409031455.483Et8eu071007@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch stable/14 has been updated by markj:

URL: https://cgit.FreeBSD.org/src/commit/?id=1c8e1e50f0097d202f42d0fc3b2080d09ac9ae92

commit 1c8e1e50f0097d202f42d0fc3b2080d09ac9ae92
Author:     Mark Johnston <markj@FreeBSD.org>
AuthorDate: 2024-08-20 14:52:02 +0000
Commit:     Mark Johnston <markj@FreeBSD.org>
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);



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202409031455.483Et8eu071007>