From owner-svn-src-head@FreeBSD.ORG  Wed Apr 10 07:01:18 2013
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 68D76346;
 Wed, 10 Apr 2013 07:01:18 +0000 (UTC) (envelope-from mm@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 5BC18865;
 Wed, 10 Apr 2013 07:01:18 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r3A71Hr0023817;
 Wed, 10 Apr 2013 07:01:17 GMT (envelope-from mm@svn.freebsd.org)
Received: (from mm@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r3A71HbW023816;
 Wed, 10 Apr 2013 07:01:17 GMT (envelope-from mm@svn.freebsd.org)
Message-Id: <201304100701.r3A71HbW023816@svn.freebsd.org>
From: Martin Matuska <mm@FreeBSD.org>
Date: Wed, 10 Apr 2013 07:01:17 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r249326 -
 head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 10 Apr 2013 07:01:18 -0000

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);