Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix recent bug in sys_accept(): we must remove the file descriptor from the 

file descriptor table before freeing the file description.
This commit is contained in:
mycroft 1999-11-05 11:48:57 +00:00
parent 6c011bf076
commit 895de56d08
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
sys/kern/uipc_syscalls.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: uipc_syscalls.c,v 1.48 1999/10/30 12:11:27 enami Exp $ */ /* $NetBSD: uipc_syscalls.c,v 1.49 1999/11/05 11:48:57 mycroft Exp $ */
/* /*
* Copyright (c) 1982, 1986, 1989, 1990, 1993 * Copyright (c) 1982, 1986, 1989, 1990, 1993
@ -177,10 +177,11 @@ sys_accept(p, v, retval)
syscallarg(struct sockaddr *) name; syscallarg(struct sockaddr *) name;
syscallarg(unsigned int *) anamelen; syscallarg(unsigned int *) anamelen;
} */ *uap = v; } */ *uap = v;
struct filedesc *fdp = p->p_fd;
struct file *fp; struct file *fp;
struct mbuf *nam; struct mbuf *nam;
unsigned int namelen; unsigned int namelen;
int error, s, tmpfd; int error, s, fd;
register struct socket *so; register struct socket *so;
if (SCARG(uap, name) && (error = copyin((caddr_t)SCARG(uap, anamelen), if (SCARG(uap, name) && (error = copyin((caddr_t)SCARG(uap, anamelen),
@ -192,7 +193,7 @@ sys_accept(p, v, retval)
return (EFAULT); return (EFAULT);
/* getsock() will use the descriptor for us */ /* getsock() will use the descriptor for us */
if ((error = getsock(p->p_fd, SCARG(uap, s), &fp)) != 0) if ((error = getsock(fdp, SCARG(uap, s), &fp)) != 0)
return (error); return (error);
s = splsoftnet(); s = splsoftnet();
so = (struct socket *)fp->f_data; so = (struct socket *)fp->f_data;
@ -228,11 +229,11 @@ sys_accept(p, v, retval)
return (error); return (error);
} }
/* falloc() will use the descriptor for us */ /* falloc() will use the descriptor for us */
if ((error = falloc(p, &fp, &tmpfd)) != 0) { if ((error = falloc(p, &fp, &fd)) != 0) {
splx(s); splx(s);
return (error); return (error);
} }
*retval = tmpfd; *retval = fd;
{ struct socket *aso = so->so_q.tqh_first; { struct socket *aso = so->so_q.tqh_first;
if (soqremque(aso, 1) == 0) if (soqremque(aso, 1) == 0)
panic("accept"); panic("accept");
@ -254,11 +255,11 @@ sys_accept(p, v, retval)
(caddr_t)SCARG(uap, anamelen), (caddr_t)SCARG(uap, anamelen),
sizeof(*SCARG(uap, anamelen))); sizeof(*SCARG(uap, anamelen)));
} }
/* if an error occured, free the file descriptor */ /* if an error occured, free the file descriptor */
if (error) if (error) {
fdp->fd_ofiles[fd] = 0;
ffree(fp); ffree(fp);
}
m_freem(nam); m_freem(nam);
splx(s); splx(s);
return (error); return (error);