[src/trunk]: src/sys/compat/netbsd32 In netbsd32_from_{ifreq, oifreq}(), use t...

[njoly <njoly%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/b0451da62f01
branches:  trunk
changeset: 749851:b0451da62f01
user:      njoly <njoly%NetBSD.org@localhost>
date:      Fri Dec 11 11:14:34 2009 +0000

description:
In netbsd32_from_{ifreq,oifreq}(), use the compat structure size for
memcpy.

>From mrg.

diffstat:

 sys/compat/netbsd32/netbsd32_ioctl.c |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (36 lines):

diff -r 68cdf3a0f8bd -r b0451da62f01 sys/compat/netbsd32/netbsd32_ioctl.c
--- a/sys/compat/netbsd32/netbsd32_ioctl.c      Fri Dec 11 11:07:04 2009 +0000
+++ b/sys/compat/netbsd32/netbsd32_ioctl.c      Fri Dec 11 11:14:34 2009 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: netbsd32_ioctl.c,v 1.45 2009/12/10 15:47:23 njoly Exp $        */
+/*     $NetBSD: netbsd32_ioctl.c,v 1.46 2009/12/11 11:14:34 njoly Exp $        */
 
 /*
  * Copyright (c) 1998, 2001 Matthew R. Green
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_ioctl.c,v 1.45 2009/12/10 15:47:23 njoly Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_ioctl.c,v 1.46 2009/12/11 11:14:34 njoly Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -254,7 +254,7 @@
         * union member needs to be converted to 64 bits... this
         * is very driver specific and so we ignore it for now..
         */
-       memcpy(s32p, p, sizeof *p);
+       memcpy(s32p, p, sizeof *s32p);
        if (cmd == SIOCGIFDATA || cmd == SIOCZIFDATA)
                NETBSD32PTR32(s32p->ifr_data, p->ifr_data);
 }
@@ -269,7 +269,7 @@
         * union member needs to be converted to 64 bits... this
         * is very driver specific and so we ignore it for now..
         */
-       memcpy(s32p, p, sizeof *p);
+       memcpy(s32p, p, sizeof *s32p);
        if (cmd == SIOCGIFDATA || cmd == SIOCZIFDATA)
                NETBSD32PTR32(s32p->ifr_data, p->ifr_data);
 }