diff options
| author | dillon <dillon@FreeBSD.org> | 1999-12-12 07:06:39 +0000 |
|---|---|---|
| committer | dillon <dillon@FreeBSD.org> | 1999-12-12 07:06:39 +0000 |
| commit | 08e8d78b501bf7a046c5972d20a883d62ec5456b (patch) | |
| tree | cf098b01da15fcb058627fac2994e8366d544280 /sys/nfs/nfs_serv.c | |
| parent | 9c9d5f88d9b204e3a4bd9974961b1e1cfff5b952 (diff) | |
| download | FreeBSD-src-08e8d78b501bf7a046c5972d20a883d62ec5456b.zip FreeBSD-src-08e8d78b501bf7a046c5972d20a883d62ec5456b.tar.gz | |
Fix a number of server-side issues related to aborting badly formed
NFS packets, mainly initializing structure pointers to NULL which
are conditionally freed prior to return.
PR: kern/15249
Submitted by: Ian Dowse <iedowse@maths.tcd.ie>
Diffstat (limited to 'sys/nfs/nfs_serv.c')
| -rw-r--r-- | sys/nfs/nfs_serv.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/nfs/nfs_serv.c b/sys/nfs/nfs_serv.c index 122e7f3..e0aa5ab 100644 --- a/sys/nfs/nfs_serv.c +++ b/sys/nfs/nfs_serv.c @@ -249,7 +249,7 @@ nfsrv_getattr(nfsd, slp, procp, mrq) register struct nfs_fattr *fp; struct vattr va; register struct vattr *vap = &va; - struct vnode *vp; + struct vnode *vp = NULL; nfsfh_t nfh; fhandle_t *fhp; register u_int32_t *tl; @@ -453,7 +453,7 @@ nfsrv_lookup(nfsd, slp, procp, mrq) struct ucred *cred = &nfsd->nd_cr; register struct nfs_fattr *fp; struct nameidata nd, ind, *ndp = &nd; - struct vnode *vp, *dirp; + struct vnode *vp, *dirp = NULL; nfsfh_t nfh; fhandle_t *fhp; register caddr_t cp; @@ -775,7 +775,7 @@ nfsrv_read(nfsd, slp, procp, mrq) char *cp2; struct mbuf *mb, *mb2, *mreq; struct mbuf *m2; - struct vnode *vp; + struct vnode *vp = NULL; nfsfh_t nfh; fhandle_t *fhp; struct uio io, *uiop = &io; @@ -1168,7 +1168,7 @@ nfsrv_writegather(ndp, slp, procp, mrq) int ioflags, aftat_ret = 1, s, adjust, v3, zeroing; char *cp2; struct mbuf *mb, *mb2, *mreq, *mrep, *md; - struct vnode *vp; + struct vnode *vp = NULL; struct uio io, *uiop = &io; u_quad_t frev, cur_usec; |
