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);
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
