diff options
| author | Otto Moerbeek <otto@cvs.openbsd.org> | 2009-02-22 07:47:23 +0000 |
|---|---|---|
| committer | Otto Moerbeek <otto@cvs.openbsd.org> | 2009-02-22 07:47:23 +0000 |
| commit | daea31b785b4497a3bb956c142810504edb37eb0 (patch) | |
| tree | a05c75f977789463f27bbbf079e67e9e9b15738d /sys/kern/sys_socket.c | |
| parent | 5a1b1a963a64a8b6b5ce84deb42c189f50859cd7 (diff) | |
fix PR 6082: do not create more fd's than will fit in the message on
the receiving side when passing fd's. ok deraadt@ kettenis@
Diffstat (limited to 'sys/kern/sys_socket.c')
| -rw-r--r-- | sys/kern/sys_socket.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sys/kern/sys_socket.c b/sys/kern/sys_socket.c index 3665003969b..d044ce1629b 100644 --- a/sys/kern/sys_socket.c +++ b/sys/kern/sys_socket.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sys_socket.c,v 1.13 2008/10/02 14:40:22 deraadt Exp $ */ +/* $OpenBSD: sys_socket.c,v 1.14 2009/02/22 07:47:22 otto Exp $ */ /* $NetBSD: sys_socket.c,v 1.13 1995/08/12 23:59:09 mycroft Exp $ */ /* @@ -58,7 +58,8 @@ soo_read(struct file *fp, off_t *poff, struct uio *uio, struct ucred *cred) { return (soreceive((struct socket *)fp->f_data, (struct mbuf **)0, - uio, (struct mbuf **)0, (struct mbuf **)0, (int *)0)); + uio, (struct mbuf **)0, (struct mbuf **)0, (int *)0, + (socklen_t)0)); } /* ARGSUSED */ |