From owner-svn-src-user@FreeBSD.ORG  Wed Dec 10 15:30:45 2008
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 490AD1065670;
	Wed, 10 Dec 2008 15:30:45 +0000 (UTC) (envelope-from dfr@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 3A4768FC14;
	Wed, 10 Dec 2008 15:30:45 +0000 (UTC) (envelope-from dfr@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 mBAFUjMg033943;
	Wed, 10 Dec 2008 15:30:45 GMT (envelope-from dfr@svn.freebsd.org)
Received: (from dfr@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id mBAFUjWA033942;
	Wed, 10 Dec 2008 15:30:45 GMT (envelope-from dfr@svn.freebsd.org)
Message-Id: <200812101530.mBAFUjWA033942@svn.freebsd.org>
From: Doug Rabson <dfr@FreeBSD.org>
Date: Wed, 10 Dec 2008 15:30:45 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r185861 - in user/dfr/gssapi/7/sys: . modules/cxgb
	nfsserver
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 10 Dec 2008 15:30:45 -0000

Author: dfr
Date: Wed Dec 10 15:30:45 2008
New Revision: 185861
URL: http://svn.freebsd.org/changeset/base/185861

Log:
  MFC: 185860 - stack overflow in fha_assign.

Modified:
  user/dfr/gssapi/7/sys/   (props changed)
  user/dfr/gssapi/7/sys/modules/cxgb/   (props changed)
  user/dfr/gssapi/7/sys/nfsserver/nfs_fha.c

Modified: user/dfr/gssapi/7/sys/nfsserver/nfs_fha.c
==============================================================================
--- user/dfr/gssapi/7/sys/nfsserver/nfs_fha.c	Wed Dec 10 14:49:54 2008	(r185860)
+++ user/dfr/gssapi/7/sys/nfsserver/nfs_fha.c	Wed Dec 10 15:30:45 2008	(r185861)
@@ -162,7 +162,7 @@ static void
 fha_extract_info(struct svc_req *req, struct fha_info *i)
 {
 	struct mbuf *md = req->rq_args;
-	fhandle_t fh;
+	nfsfh_t fh;
 	caddr_t dpos = mtod(md, caddr_t);
 	static u_int64_t random_fh = 0;
 	int error;
@@ -205,11 +205,11 @@ fha_extract_info(struct svc_req *req, st
 		goto out;
 	
 	/* Grab the filehandle. */
-	error = nfsm_srvmtofh_xx(&fh, v3, &md, &dpos);
+	error = nfsm_srvmtofh_xx(&fh.fh_generic, v3, &md, &dpos);
 	if (error)
 		goto out;
 
-	i->fh = *(const u_int64_t *)(fh.fh_fid.fid_data);
+	i->fh = *(const u_int64_t *)(fh.fh_generic.fh_fid.fid_data);
 
 	/* Content ourselves with zero offset for all but reads. */
 	if (procnum != NFSPROC_READ)