Index: head/stand/i386/libi386/i386_copy.c =================================================================== --- head/stand/i386/libi386/i386_copy.c (revision 354534) +++ head/stand/i386/libi386/i386_copy.c (revision 354535) @@ -1,75 +1,75 @@ /*- * Copyright (c) 1998 Michael Smith * All rights reserved. * * 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. * 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. * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) * 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. */ #include __FBSDID("$FreeBSD$"); /* * MD primitives supporting placement of module data * * XXX should check load address/size against memory top. */ #include #include "libi386.h" #include "btxv86.h" ssize_t i386_copyin(const void *src, vm_offset_t dest, const size_t len) { - if (dest + len >= memtop) { - errno = EFBIG; - return(-1); - } + if (dest + len >= memtop) { + errno = EFBIG; + return (-1); + } - bcopy(src, PTOV(dest), len); - return(len); + bcopy(src, PTOV(dest), len); + return (len); } ssize_t i386_copyout(const vm_offset_t src, void *dest, const size_t len) { - if (src + len >= memtop) { - errno = EFBIG; - return(-1); - } - - bcopy(PTOV(src), dest, len); - return(len); + if (src + len >= memtop) { + errno = EFBIG; + return (-1); + } + + bcopy(PTOV(src), dest, len); + return (len); } ssize_t i386_readin(const int fd, vm_offset_t dest, const size_t len) { - if (dest + len >= memtop_copyin) { - errno = EFBIG; - return(-1); - } + if (dest + len >= memtop_copyin) { + errno = EFBIG; + return (-1); + } - return (read(fd, PTOV(dest), len)); + return (read(fd, PTOV(dest), len)); }