diff options
| author | mm <mm@FreeBSD.org> | 2013-04-10 07:01:17 +0000 |
|---|---|---|
| committer | mm <mm@FreeBSD.org> | 2013-04-10 07:01:17 +0000 |
| commit | a3459995feca5bdd2a4a29458cfc1fe6c143225e (patch) | |
| tree | 95a852f54e1518b1d79e099e1f1840d88e6cc644 | |
| parent | 3bab173b64b03e7f4e6226b45da13787c9ea6acf (diff) | |
| download | FreeBSD-src-a3459995feca5bdd2a4a29458cfc1fe6c143225e.zip FreeBSD-src-a3459995feca5bdd2a4a29458cfc1fe6c143225e.tar.gz | |
Cast to (void *)(uintptr_t) on copyout and copyin of zfs_iocparm_t.zfs_cmd
MFC after: 9 days
| -rw-r--r-- | sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c index 0dfa6ec..2b6a245 100644 --- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c +++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c @@ -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 @@ 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); |
