diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2003-06-02 07:07:26 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2003-06-02 07:07:26 +0000 |
| commit | ba5e7241b9aa05de6714a5a74f52a2370248760d (patch) | |
| tree | 2addf530e5b9f293553b67939adb25dd987e4df4 /sys/arch/mvmeppc | |
| parent | 9913b34acf65122340629d3b1dc898bec6de44a8 (diff) | |
licence cleanup
Diffstat (limited to 'sys/arch/mvmeppc')
| -rw-r--r-- | sys/arch/mvmeppc/include/prom.h | 7 | ||||
| -rw-r--r-- | sys/arch/mvmeppc/mvmeppc/bus_dma.c | 5 |
2 files changed, 5 insertions, 7 deletions
diff --git a/sys/arch/mvmeppc/include/prom.h b/sys/arch/mvmeppc/include/prom.h index 7a10c4568fb..89403f4b56a 100644 --- a/sys/arch/mvmeppc/include/prom.h +++ b/sys/arch/mvmeppc/include/prom.h @@ -1,4 +1,4 @@ -/* $OpenBSD: prom.h,v 1.3 2001/11/18 22:48:02 miod Exp $ */ +/* $OpenBSD: prom.h,v 1.4 2003/06/02 07:07:25 deraadt Exp $ */ /* * Copyright (c) 2001 Steve Murphree, Jr. * All rights reserved. @@ -11,11 +11,6 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by Theo de Raadt - * 4. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES diff --git a/sys/arch/mvmeppc/mvmeppc/bus_dma.c b/sys/arch/mvmeppc/mvmeppc/bus_dma.c index 8c23bd3e80e..a06e36a4d55 100644 --- a/sys/arch/mvmeppc/mvmeppc/bus_dma.c +++ b/sys/arch/mvmeppc/mvmeppc/bus_dma.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bus_dma.c,v 1.11 2002/10/07 18:35:56 mickey Exp $ */ +/* $OpenBSD: bus_dma.c,v 1.12 2003/06/02 07:07:25 deraadt Exp $ */ /* $NetBSD: bus_dma.c,v 1.2 2001/06/10 02:31:25 briggs Exp $ */ /*- @@ -331,6 +331,9 @@ _bus_dmamap_load_uio(t, map, uio, flags) resid = uio->uio_resid; iov = uio->uio_iov; + if (resid > map->_dm_size) + return (EINVAL); + if (uio->uio_segflg == UIO_USERSPACE) { p = uio->uio_procp; #ifdef DIAGNOSTIC |