d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Conditionally acquire Giant when entering the socket layer via file

Browse Source 
descriptor operations based on debug.mpsafenet, rather than acquiring
Giant unconditionally.
This commit is contained in:
rwatson 2004-03-29 01:55:32 +00:00
parent e2c58ec1b8
commit 3b7dc3c3f7
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sys/kern/sys_socket.c
View File

@ -79,16 +79,16 @@ soo_read(fp, uio, active_cred, flags, td)
struct socket *so = fp->f_data;
int error;
mtx_lock(&Giant);
NET_LOCK_GIANT();
#ifdef MAC
error = mac_check_socket_receive(active_cred, so);
if (error) {
mtx_unlock(&Giant);
NET_UNLOCK_GIANT();
return (error);
}
#endif
error = so->so_proto->pr_usrreqs->pru_soreceive(so, 0, uio, 0, 0, 0);
mtx_unlock(&Giant);
NET_UNLOCK_GIANT();
return (error);
}
@ -104,17 +104,17 @@ soo_write(fp, uio, active_cred, flags, td)
struct socket *so = fp->f_data;
int error;
mtx_lock(&Giant);
NET_LOCK_GIANT();
#ifdef MAC
error = mac_check_socket_send(active_cred, so);
if (error) {
mtx_unlock(&Giant);
NET_UNLOCK_GIANT();
return (error);
}
#endif
error = so->so_proto->pr_usrreqs->pru_sosend(so, 0, uio, 0, 0, 0,
uio->uio_td);
mtx_unlock(&Giant);
NET_UNLOCK_GIANT();
return (error);
}