diff options
author | Doug Rabson <dfr@FreeBSD.org> | 1998-11-13 09:44:12 +0000 |
---|---|---|
committer | Doug Rabson <dfr@FreeBSD.org> | 1998-11-13 09:44:12 +0000 |
commit | 86442b520111effe645bc9edc8873b569415e70c (patch) | |
tree | 5d81eb504d24331b53bc11e7d0c5ba0fda1142c7 /sys/nfsserver | |
parent | 92c6ae04da6960225312d831d92705acb633e591 (diff) | |
download | src-86442b520111effe645bc9edc8873b569415e70c.tar.gz src-86442b520111effe645bc9edc8873b569415e70c.zip |
Fix a panic in nfsrv_dorec() where a NULL pointer could be passed to
free() sometimes.
Reviewed by: Eric Haug <ejh@eas.slu.edu>
Notes
Notes:
svn path=/head/; revision=41132
Diffstat (limited to 'sys/nfsserver')
-rw-r--r-- | sys/nfsserver/nfs_srvsock.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sys/nfsserver/nfs_srvsock.c b/sys/nfsserver/nfs_srvsock.c index 11ac51899598..832785607a49 100644 --- a/sys/nfsserver/nfs_srvsock.c +++ b/sys/nfsserver/nfs_srvsock.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)nfs_socket.c 8.5 (Berkeley) 3/30/95 - * $Id: nfs_socket.c,v 1.45 1998/09/07 05:42:15 bde Exp $ + * $Id: nfs_socket.c,v 1.46 1998/09/29 22:33:05 mckusick Exp $ */ /* @@ -2232,7 +2232,9 @@ nfsrv_dorec(slp, nfsd, ndp) nd->nd_dpos = mtod(m, caddr_t); error = nfs_getreq(nd, nfsd, TRUE); if (error) { - FREE(nam, M_SONAME); + if (nam) { + FREE(nam, M_SONAME); + } free((caddr_t)nd, M_NFSRVDESC); return (error); } |