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

Fix missing holdsock()->fgetsock()

Browse Source 
Submitted by:	Hisashi Hiramoto <hiramoto@phys.chs.nihon-u.ac.jp>
This commit is contained in:
Matthew Dillon 2001-11-17 18:43:13 +00:00
parent 3cf64d0fbb
commit 39c95b8377
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sys/compat/linux/linux_socket.c
View File

@ -416,7 +416,7 @@ linux_connect(struct thread *td, struct linux_connect_args *args)
int namelen;
} */ bsd_args;
struct socket *so;
struct file *fp;
u_int fflag;
int error;
#ifdef __alpha__
@ -438,17 +438,15 @@ linux_connect(struct thread *td, struct linux_connect_args *args)
* when on a non-blocking socket. Instead it returns the
* error getsockopt(SOL_SOCKET, SO_ERROR) would return on BSD.
*/
error = holdsock(td->td_proc->p_fd, linux_args.s, &fp);
if (error)
return (error);
if ((error = fgetsock(td, linux_args.s, &so, &fflag)) != 0)
return(error);
error = EISCONN;
if (fp->f_flag & FNONBLOCK) {
so = (struct socket *)fp->f_data;
if (fflag & FNONBLOCK) {
if (so->so_emuldata == 0)
error = so->so_error;
so->so_emuldata = (void *)1;
}
fdrop(fp, td);
fputsock(so);
return (error);
}