d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cast to (void *)(uintptr_t) on copyout and copyin of zfs_iocparm_t.zfs_cmd

Browse Source 
MFC after:	9 days
This commit is contained in:
Martin Matuska 2013-04-10 07:01:17 +00:00
parent 1472b87f2f
commit 86161c3eeb
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c
View File

@ -5807,7 +5807,7 @@ zfsdev_ioctl(struct cdev *dev, u_long zcmd, caddr_t arg, int flag,
error = SET_ERROR(EFAULT);
goto out;
}
error = ddi_copyin((void *)zc_iocparm->zfs_cmd, zc,
error = ddi_copyin((void *)(uintptr_t)zc_iocparm->zfs_cmd, zc,
sizeof(zfs_cmd_t), flag);
if (error != 0) {
error = SET_ERROR(EFAULT);
@ -5948,7 +5948,7 @@ zfsdev_ioctl(struct cdev *dev, u_long zcmd, caddr_t arg, int flag,
error = SET_ERROR(EFAULT);
#else
if (newioc) {
rc = ddi_copyout(zc, (void *)zc_iocparm->zfs_cmd,
rc = ddi_copyout(zc, (void *)(uintptr_t)zc_iocparm->zfs_cmd,
sizeof (zfs_cmd_t), flag);
if (error == 0 && rc != 0)
error = SET_ERROR(EFAULT);