summaryrefslogtreecommitdiff
path: root/sys/nfs
diff options
context:
space:
mode:
authorBret Lambert <blambert@cvs.openbsd.org>2008-10-31 17:28:48 +0000
committerBret Lambert <blambert@cvs.openbsd.org>2008-10-31 17:28:48 +0000
commit0b523ee4325df11ed5713a400d134cbefbf92ce3 (patch)
treecb32dae6eb4b314f62a2dd9bafe06c3f40feb4f2 /sys/nfs
parent6ded44d9ea95edcadc9a2436519041f32e49ecd9 (diff)
Revert last commit; mbuf leaks are not solved by double-freeing mbuf chains
blambert@-- Real solution is to fix NFS mbuf handling.
Diffstat (limited to 'sys/nfs')
-rw-r--r--sys/nfs/nfs_socket.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/sys/nfs/nfs_socket.c b/sys/nfs/nfs_socket.c
index ae2759ef7fa..da9bd7c7316 100644
--- a/sys/nfs/nfs_socket.c
+++ b/sys/nfs/nfs_socket.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: nfs_socket.c,v 1.69 2008/10/26 15:53:16 blambert Exp $ */
+/* $OpenBSD: nfs_socket.c,v 1.70 2008/10/31 17:28:47 blambert Exp $ */
/* $NetBSD: nfs_socket.c,v 1.27 1996/04/15 20:20:00 thorpej Exp $ */
/*
@@ -1860,10 +1860,7 @@ nfsrv_dorec(slp, nfsd, ndp)
nd->nd_dpos = mtod(m, caddr_t);
error = nfs_getreq(nd, nfsd, TRUE);
if (error) {
- if (nd->nd_nam2)
- m_freem(nd->nd_nam2);
- if (nd->nd_mrep)
- m_freem(nd->nd_mrep);
+ m_freem(nam);
free(nd, M_NFSRVDESC);
return (error);
}