Author: mm
Date: Wed Apr 10 07:01:17 2013
New Revision: 249326
URL: http://svnweb.freebsd.org/changeset/base/249326
Log:
Cast to (void *)(uintptr_t) on copyout and copyin of zfs_iocparm_t.zfs_cmd
MFC after: 9 days
Modified:
head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c
Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c
==============================================================================
--- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c Wed Apr
10 06:21:39 2013 (r249325)
+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c Wed Apr
10 07:01:17 2013 (r249326)
@@ -5807,7 +5807,7 @@ zfsdev_ioctl(struct cdev *dev, u_long zc
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 @@ out:
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);
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "[email protected]"
