d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix a panic in nfsrv_dorec() where a NULL pointer could be passed to

Browse Source 
free() sometimes.

Reviewed by: Eric Haug <ejh@eas.slu.edu>
This commit is contained in:
Doug Rabson 1998-11-13 09:44:12 +00:00
parent 92c6ae04da
commit 86442b5201
3 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/nfs/nfs_socket.c
View File

@ -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);
}

6
sys/nfsclient/nfs_socket.c
View File

@ -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);
}

6
sys/nfsserver/nfs_srvsock.c
View File

@ -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);
}