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

Set curvnet earlier so that it also covers calls to sodisconnect(), which

Browse Source 
before were possibly panicing the system in ULP code in the VIMAGE case.

Submitted by:	Igor (igor ispsystem.com)
MFC after:	5 days
This commit is contained in:
Bjoern A. Zeeb 2010-02-20 22:29:28 +00:00
parent cf5756a6bf
commit 0a68a45914
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sys/kern/uipc_socket.c
View File

@ -773,6 +773,8 @@ soconnect(struct socket *so, struct sockaddr *nam, struct thread *td)
if (so->so_options & SO_ACCEPTCONN)
return (EOPNOTSUPP);
CURVNET_SET(so->so_vnet);
/*
* If protocol is connection-based, can only connect once.
* Otherwise, if connected, try to disconnect first. This allows
@ -788,10 +790,9 @@ soconnect(struct socket *so, struct sockaddr *nam, struct thread *td)
* biting us.
*/
so->so_error = 0;
CURVNET_SET(so->so_vnet);
error = (*so->so_proto->pr_usrreqs->pru_connect)(so, nam, td);
CURVNET_RESTORE();
}
CURVNET_RESTORE();
return (error);
}