Module Name: src Committed By: bouyer Date: Sun Nov 15 20:48:49 UTC 2015
Modified Files: src/sys/compat/osf1 [netbsd-6]: osf1_socket.c Log Message: Pull up following revision(s) (requested by maxv in ticket #1338): sys/compat/osf1/osf1_socket.c: revision 1.21 easy kmem_alloc(0) ok shm@ To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.20.14.1 src/sys/compat/osf1/osf1_socket.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/compat/osf1/osf1_socket.c diff -u src/sys/compat/osf1/osf1_socket.c:1.20 src/sys/compat/osf1/osf1_socket.c:1.20.14.1 --- src/sys/compat/osf1/osf1_socket.c:1.20 Fri Apr 23 15:19:21 2010 +++ src/sys/compat/osf1/osf1_socket.c Sun Nov 15 20:48:49 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: osf1_socket.c,v 1.20 2010/04/23 15:19:21 rmind Exp $ */ +/* $NetBSD: osf1_socket.c,v 1.20.14.1 2015/11/15 20:48:49 bouyer Exp $ */ /* * Copyright (c) 1999 Christopher G. Demetriou. All rights reserved. @@ -58,7 +58,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: osf1_socket.c,v 1.20 2010/04/23 15:19:21 rmind Exp $"); +__KERNEL_RCSID(0, "$NetBSD: osf1_socket.c,v 1.20.14.1 2015/11/15 20:48:49 bouyer Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -116,7 +116,7 @@ osf1_sys_sendmsg_xopen(struct lwp *l, co return (EINVAL); iov_len = bsd_msghdr.msg_iovlen; - if (iov_len > IOV_MAX) + if ((iov_len > IOV_MAX) || (iov_len == 0)) return EMSGSIZE; bsd_iovec = kmem_alloc(iov_len * sizeof(struct iovec), KM_SLEEP); bsd_msghdr.msg_iov = bsd_iovec;