Thu Aug 13 08:57:43 2009 UTC ()

Allow undescribed, direct ioctls as used by Unix. This capability was removed in BSD, presumably because nothing used it any more.
Third party system software written for Unix (like ZFS) requires this to work without significant modifications.

Ok supremeleader@


(haad)

diff -r1.123 -r1.124 src/sys/kern/sys_generic.c

--- src/sys/kern/sys_generic.c 2009/05/24 21:41:26	1.123
+++ src/sys/kern/sys_generic.c 2009/08/13 08:57:43	1.124

 @@ -1,14 +1,14 @@
-/*	$NetBSD: sys_generic.c,v 1.123 2009/05/24 21:41:26 ad Exp $	*/
+/*	$NetBSD: sys_generic.c,v 1.124 2009/08/13 08:57:43 haad Exp $	*/
 /*-
  * Copyright (c) 2007, 2008, 2009 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Andrew Doran.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -60,27 +60,27 @@
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  *	@(#)sys_generic.c	8.9 (Berkeley) 2/14/95
  */
 /*
  * System calls relating to files.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sys_generic.c,v 1.123 2009/05/24 21:41:26 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sys_generic.c,v 1.124 2009/08/13 08:57:43 haad Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/filedesc.h>
 #include <sys/ioctl.h>
 #include <sys/file.h>
 #include <sys/proc.h>
 #include <sys/socketvar.h>
 #include <sys/signalvar.h>
 #include <sys/uio.h>
 #include <sys/kernel.h>
 #include <sys/stat.h>
 #include <sys/kmem.h>
 @@ -555,51 +555,60 @@ sys_ioctl(struct lwp *l, const struct sy
 		goto out;
+	}
 	/*
 	 * Interpret high order word to find amount of data to be
 	 * copied to/from the user's address space.
 	 */
 	size = IOCPARM_LEN(com);
 	if (size > IOCPARM_MAX) {
 		error = ENOTTY;
 		goto out;
+	}
 	memp = NULL;
-	if (size > sizeof(stkbuf)) {
+	if ((com >> IOCPARM_SHIFT) == 0)  {
-		memp = kmem_alloc(size, KM_SLEEP);
+		/* UNIX-style ioctl. */
-		data = memp;
+		data = SCARG(uap, data);
-	} else
+	} else {
-		data = (void *)stkbuf;
+		if (size > sizeof(stkbuf)) {
-	if (com&IOC_IN) {
+			memp = kmem_alloc(size, KM_SLEEP);
-		if (size) {
+			data = memp;
-			error = copyin(SCARG(uap, data), data, size);
+		} else {
-			if (error) {
+			data = (void *)stkbuf;
 				if (memp)
-					kmem_free(memp, size);
+		if (com&IOC_IN) {
-				goto out;
+			if (size) {
 				error = copyin(SCARG(uap, data), data, size);
 				if (error) {
 					if (memp) {
 						kmem_free(memp, size);
+					}
 					goto out;
+				}
 				ktrgenio(SCARG(uap, fd), UIO_WRITE,
 				    SCARG(uap, data), size, 0);
 			} else {
 				*(void **)data = SCARG(uap, data);
+			}
-			ktrgenio(SCARG(uap, fd), UIO_WRITE, SCARG(uap, data),
+		} else if ((com&IOC_OUT) && size) {
-			    size, 0);
+			/*
-		} else
+			 * Zero the buffer so the user always
 			 * gets back something deterministic.
 			 */
 			memset(data, 0, size);
 		} else if (com&IOC_VOID) {
 			*(void **)data = SCARG(uap, data);
 	} else if ((com&IOC_OUT) && size)
 		/*
 		 * Zero the buffer so the user always
 		 * gets back something deterministic.
 		 */
 		memset(data, 0, size);
 	else if (com&IOC_VOID)
 		*(void **)data = SCARG(uap, data);
 	switch (com) {
 	case FIONBIO:
 		/* XXX Code block is not atomic */
 		if (*(int *)data != 0)
 			atomic_or_uint(&fp->f_flag, FNONBLOCK);
 		else
 			atomic_and_uint(&fp->f_flag, ~FNONBLOCK);
 		error = (*fp->f_ops->fo_ioctl)(fp, FIONBIO, data);
 		break;
 	case FIOASYNC: