Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make netbsd32_from_{ifreq,oifreq}() copy the whole structure, not only 

the interface name. Finally fix my own PR/39424.

ok by christos.
This commit is contained in:
njoly 2009-12-10 14:58:28 +00:00
parent 6a9e4e8eeb
commit 86051746c6
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sys/compat/netbsd32/netbsd32_ioctl.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: netbsd32_ioctl.c,v 1.43 2009/12/09 04:50:47 christos Exp $ */
/* $NetBSD: netbsd32_ioctl.c,v 1.44 2009/12/10 14:58:28 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.43 2009/12/09 04:50:47 christos Exp $");
__KERNEL_RCSID(0, "$NetBSD: netbsd32_ioctl.c,v 1.44 2009/12/10 14:58:28 njoly Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -254,8 +254,7 @@ netbsd32_from_ifreq(struct ifreq *p, struct netbsd32_ifreq *s32p, u_long cmd)
* union member needs to be converted to 64 bits... this
* is very driver specific and so we ignore it for now..
*/
(void)memcpy(s32p->ifr_name, p->ifr_name,
MIN(sizeof(s32p->ifr_name), sizeof(p->ifr_name)));
memcpy(s32p, p, sizeof *p);
if (cmd == SIOCGIFDATA || cmd == SIOCZIFDATA)
NETBSD32PTR32(s32p->ifr_data, p->ifr_data);
}
@ -270,8 +269,7 @@ netbsd32_from_oifreq(struct oifreq *p, struct netbsd32_oifreq *s32p, u_long cmd)
* union member needs to be converted to 64 bits... this
* is very driver specific and so we ignore it for now..
*/
(void)memcpy(s32p->ifr_name, p->ifr_name,
MIN(sizeof(s32p->ifr_name), sizeof(p->ifr_name)));
memcpy(s32p, p, sizeof *p);
if (cmd == SIOCGIFDATA || cmd == SIOCZIFDATA)
NETBSD32PTR32(s32p->ifr_data, p->ifr_data);
}