diff options
| author | Jonathan Gray <jsg@cvs.openbsd.org> | 2024-08-17 07:02:14 +0000 |
|---|---|---|
| committer | Jonathan Gray <jsg@cvs.openbsd.org> | 2024-08-17 07:02:14 +0000 |
| commit | 9d360da863882ee191c82d57b06a14465c2f5c20 (patch) | |
| tree | c2242761366444d3c88de832999b00a0e1cfc0b7 /sys/nfs | |
| parent | d9d588ae00014e93a09d7105a78b23dc7a9f26a1 (diff) | |
avoid uninitialised var use in nfs_serv.c error paths
some functions have a nfsmout label with code that assumes NDINIT has
been called
nfsrv_rename has two NDINIT calls, the nfsmout code assumes both are
setup but is only jumped to when none/one is setup
found with llvm scan-build
checked by deraadt@ beck@, ok miod@
Diffstat (limited to 'sys/nfs')
| -rw-r--r-- | sys/nfs/nfs_serv.c | 38 |
1 files changed, 16 insertions, 22 deletions
diff --git a/sys/nfs/nfs_serv.c b/sys/nfs/nfs_serv.c index b03d4a5f47a..74e7fed74e4 100644 --- a/sys/nfs/nfs_serv.c +++ b/sys/nfs/nfs_serv.c @@ -1,4 +1,4 @@ -/* $OpenBSD: nfs_serv.c,v 1.126 2024/05/01 13:15:59 jsg Exp $ */ +/* $OpenBSD: nfs_serv.c,v 1.127 2024/08/17 07:02:13 jsg Exp $ */ /* $NetBSD: nfs_serv.c,v 1.34 1997/05/12 23:37:12 fvdl Exp $ */ /* @@ -1038,12 +1038,12 @@ nfsrv_create(struct nfsrv_descript *nfsd, struct nfssvc_sock *slp, if (nfsm_srvmtofh1(&info, nfsd, slp, mrq) != 0) return 0; else if (error != 0) - goto nfsmout; + return error; fhp = &nfh.fh_generic; if (nfsm_srvmtofh2(&info, fhp) != 0) - goto nfsmout; + return error; if (nfsm_srvnamesiz(&info, &len) != 0) - goto nfsmout; + return error; if (error) { if (nfsm_reply(&info, nfsd, slp, mrq, error, 0) != 0) return 0; @@ -1325,12 +1325,12 @@ nfsrv_mknod(struct nfsrv_descript *nfsd, struct nfssvc_sock *slp, if (nfsm_srvmtofh1(&info, nfsd, slp, mrq) != 0) return 0; else if (error != 0) - goto nfsmout; + return error; fhp = &nfh.fh_generic; if (nfsm_srvmtofh2(&info, fhp) != 0) - goto nfsmout; + return error; if (nfsm_srvnamesiz(&info, &len) != 0) - goto nfsmout; + return error; if (error) { if (nfsm_reply(&info, nfsd, slp, mrq, error, 0) != 0) return 0; @@ -1598,12 +1598,12 @@ nfsrv_rename(struct nfsrv_descript *nfsd, struct nfssvc_sock *slp, if (nfsm_srvmtofh1(&info, nfsd, slp, mrq) != 0) return 0; else if (error != 0) - goto nfsmout; + return error; ffhp = &fnfh.fh_generic; if (nfsm_srvmtofh2(&info, ffhp) != 0) - goto nfsmout; + return error; if (nfsm_srvnamesiz(&info, &len) != 0) - goto nfsmout; + return error; if (error) { if (nfsm_reply(&info, nfsd, slp, mrq, error, 0) != 0) return 0; @@ -1757,12 +1757,6 @@ out1: nfsmout: if (fdirp) vrele(fdirp); - if (tdirp) - vrele(tdirp); - if (tond.ni_cnd.cn_nameiop) { - vrele(tond.ni_startdir); - pool_put(&namei_pool, tond.ni_cnd.cn_pnbuf); - } if (fromnd.ni_cnd.cn_nameiop) { if (fromnd.ni_startdir) vrele(fromnd.ni_startdir); @@ -1928,12 +1922,12 @@ nfsrv_symlink(struct nfsrv_descript *nfsd, struct nfssvc_sock *slp, if (nfsm_srvmtofh1(&info, nfsd, slp, mrq) != 0) return 0; else if (error != 0) - goto nfsmout; + return error; fhp = &nfh.fh_generic; if (nfsm_srvmtofh2(&info, fhp) != 0) - goto nfsmout; + return error; if (nfsm_srvnamesiz(&info, &len) != 0) - goto nfsmout; + return error; if (error) { if (nfsm_reply(&info, nfsd, slp, mrq, error, 0) != 0) return 0; @@ -2088,12 +2082,12 @@ nfsrv_mkdir(struct nfsrv_descript *nfsd, struct nfssvc_sock *slp, if (nfsm_srvmtofh1(&info, nfsd, slp, mrq) != 0) return 0; else if (error != 0) - goto nfsmout; + return error; fhp = &nfh.fh_generic; if (nfsm_srvmtofh2(&info, fhp) != 0) - goto nfsmout; + return error; if (nfsm_srvnamesiz(&info, &len) != 0) - goto nfsmout; + return error; if (error) { if (nfsm_reply(&info, nfsd, slp, mrq, error, 0) != 0) return 0; |