From owner-svn-src-head@FreeBSD.ORG  Fri Nov 14 21:05:46 2008
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:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 2F7671065686;
	Fri, 14 Nov 2008 21:05:46 +0000 (UTC)
	(envelope-from ambrisko@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 213D68FC1B;
	Fri, 14 Nov 2008 21:05:46 +0000 (UTC)
	(envelope-from ambrisko@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id mAEL5jv9001887;
	Fri, 14 Nov 2008 21:05:45 GMT
	(envelope-from ambrisko@svn.freebsd.org)
Received: (from ambrisko@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id mAEL5jsL001886;
	Fri, 14 Nov 2008 21:05:45 GMT
	(envelope-from ambrisko@svn.freebsd.org)
Message-Id: <200811142105.mAEL5jsL001886@svn.freebsd.org>
From: Doug Ambrisko <ambrisko@FreeBSD.org>
Date: Fri, 14 Nov 2008 21:05:45 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r184974 - head/sys/dev/mfi
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
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/listinfo/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: Fri, 14 Nov 2008 21:05:46 -0000

Author: ambrisko
Date: Fri Nov 14 21:05:45 2008
New Revision: 184974
URL: http://svn.freebsd.org/changeset/base/184974

Log:
  When running a 32bit app. on amd64, ensure the bits above 32bit
  are zero for the copyout.  Confirmed by LSI.

Modified:
  head/sys/dev/mfi/mfi.c

Modified: head/sys/dev/mfi/mfi.c
==============================================================================
--- head/sys/dev/mfi/mfi.c	Fri Nov 14 18:09:19 2008	(r184973)
+++ head/sys/dev/mfi/mfi.c	Fri Nov 14 21:05:45 2008	(r184974)
@@ -2130,6 +2130,14 @@ mfi_ioctl(struct cdev *dev, u_long cmd, 
 			    ->mfi_frame.raw[ioc->mfi_sense_off],
 			    &sense_ptr.sense_ptr_data[0],
 			    sizeof(sense_ptr.sense_ptr_data));
+#ifdef __amd64__
+			if (cmd != MFI_CMD) {
+				/*
+				 * not 64bit native so zero out any address
+				 * over 32bit */
+				sense_ptr.high = 0;
+			}
+#endif
 			error = copyout(cm->cm_sense, sense_ptr.user_space,
 			    ioc->mfi_sense_len);
 			if (error != 0) {
@@ -2353,6 +2361,13 @@ mfi_linux_ioctl_int(struct cdev *dev, u_
                             ->lioc_frame.raw[l_ioc.lioc_sense_off],
 			    &sense_ptr.sense_ptr_data[0],
 			    sizeof(sense_ptr.sense_ptr_data));
+#ifdef __amd64__
+			/*
+			 * only 32bit Linux support so zero out any
+			 * address over 32bit
+			 */
+			sense_ptr.high = 0;
+#endif
 			error = copyout(cm->cm_sense, sense_ptr.user_space,
 			    l_ioc.lioc_sense_len);
 			if (error != 0) {