From owner-svn-src-all@FreeBSD.ORG  Mon Jul  1 21:16:20 2013
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@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 53DB64FA;
 Mon,  1 Jul 2013 21:16:20 +0000 (UTC)
 (envelope-from rmacklem@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 45F101278;
 Mon,  1 Jul 2013 21:16:20 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r61LGJwZ058741;
 Mon, 1 Jul 2013 21:16:19 GMT (envelope-from rmacklem@svn.freebsd.org)
Received: (from rmacklem@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r61LGJjN058740;
 Mon, 1 Jul 2013 21:16:19 GMT (envelope-from rmacklem@svn.freebsd.org)
Message-Id: <201307012116.r61LGJjN058740@svn.freebsd.org>
From: Rick Macklem <rmacklem@FreeBSD.org>
Date: Mon, 1 Jul 2013 21:16:19 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r252479 - head/sys/nfsclient
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 01 Jul 2013 21:16:20 -0000

Author: rmacklem
Date: Mon Jul  1 21:16:19 2013
New Revision: 252479
URL: http://svnweb.freebsd.org/changeset/base/252479

Log:
  A recent version of the oldnfs NFS client in head/current
  will crash when doing a large write, since m_get2() would
  return NULL. This patch fixes the problem, since nfsm_uiotombuf()
  will allocate additional mbufs, as required.
  
  Reported by:	sbruno
  Tested by:	sbruno
  Discussed with:	glebius

Modified:
  head/sys/nfsclient/nfs_vnops.c

Modified: head/sys/nfsclient/nfs_vnops.c
==============================================================================
--- head/sys/nfsclient/nfs_vnops.c	Mon Jul  1 20:46:35 2013	(r252478)
+++ head/sys/nfsclient/nfs_vnops.c	Mon Jul  1 21:16:19 2013	(r252479)
@@ -1379,8 +1379,8 @@ nfs_writerpc(struct vnode *vp, struct ui
 	while (tsiz > 0) {
 		nfsstats.rpccnt[NFSPROC_WRITE]++;
 		len = (tsiz > wsize) ? wsize : tsiz;
-		mreq = m_get2(NFSX_FH(v3) + 5 * NFSX_UNSIGNED + nfsm_rndup(len),
-		    M_WAITOK, MT_DATA, 0);
+		mreq = m_get2(NFSX_FH(v3) + 5 * NFSX_UNSIGNED, M_WAITOK,
+		    MT_DATA, 0);
 		mb = mreq;
 		bpos = mtod(mb, caddr_t);
 		nfsm_fhtom(vp, v3);