X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/ff6e181ae92fc6f1e89841290f461d1f2f9badd9..4452a7af2eac33dbad800bcc91f2399d62c18f53:/bsd/nfs/nfs_serv.c?ds=sidebyside diff --git a/bsd/nfs/nfs_serv.c b/bsd/nfs/nfs_serv.c index e575d31f7..04c0aee42 100644 --- a/bsd/nfs/nfs_serv.c +++ b/bsd/nfs/nfs_serv.c @@ -1,14 +1,19 @@ /* * Copyright (c) 2000-2005 Apple Computer, Inc. All rights reserved. * - * @APPLE_LICENSE_HEADER_START@ + * @APPLE_OSREFERENCE_LICENSE_HEADER_START@ * * This file contains Original Code and/or Modifications of Original Code * as defined in and that are subject to the Apple Public Source License * Version 2.0 (the 'License'). You may not use this file except in - * compliance with the License. Please obtain a copy of the License at - * http://www.opensource.apple.com/apsl/ and read it before using this - * file. + * compliance with the License. The rights granted to you under the License + * may not be used to create, or enable the creation or redistribution of, + * unlawful or unlicensed copies of an Apple operating system, or to + * circumvent, violate, or enable the circumvention or violation of, any + * terms of an Apple operating system software license agreement. + * + * Please obtain a copy of the License at + * http://www.opensource.apple.com/apsl/ and read it before using this file. * * The Original Code and all software distributed under the License are * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER @@ -18,7 +23,7 @@ * Please see the License for the specific language governing rights and * limitations under the License. * - * @APPLE_LICENSE_HEADER_END@ + * @APPLE_OSREFERENCE_LICENSE_HEADER_END@ */ /* Copyright (c) 1995 NeXT Computer, Inc. All Rights Reserved */ /* @@ -214,10 +219,7 @@ nfsrv3_access(nfsd, slp, procp, mrq) KAUTH_VNODE_DELETE_CHILD; } else { testaction = - KAUTH_VNODE_WRITE_DATA | - KAUTH_VNODE_WRITE_ATTRIBUTES | - KAUTH_VNODE_WRITE_EXTATTRIBUTES | - KAUTH_VNODE_WRITE_SECURITY; + KAUTH_VNODE_WRITE_DATA; } if (nfsrv_authorize(vp, NULL, testaction, &context, nxo, 0)) nfsmode &= ~NFSV3ACCESS_MODIFY; @@ -781,7 +783,7 @@ nfsrv_read(nfsd, slp, procp, mrq) int i; caddr_t bpos; int error = 0, count, len, left, siz, tlen, getret; - int v3 = (nfsd->nd_flag & ND_NFSV3), reqlen; + int v3 = (nfsd->nd_flag & ND_NFSV3), reqlen, maxlen; char *cp2; mbuf_t mb, mb2, mreq; mbuf_t m2; @@ -804,7 +806,12 @@ nfsrv_read(nfsd, slp, procp, mrq) nfsm_dissect(tl, u_long *, NFSX_UNSIGNED); off = (off_t)fxdr_unsigned(u_long, *tl); } - nfsm_srvstrsiz(reqlen, NFS_SRVMAXDATA(nfsd)); + nfsm_dissect(tl, u_long *, NFSX_UNSIGNED); + reqlen = fxdr_unsigned(u_long, *tl); + maxlen = NFS_SRVMAXDATA(nfsd); + if (reqlen > maxlen) + reqlen = maxlen; + if ((error = nfsrv_fhtovp(&nfh, nam, TRUE, &vp, &nx, &nxo))) { nfsm_reply(2 * NFSX_UNSIGNED); nfsm_srvpostop_attr(1, NULL); @@ -1164,11 +1171,7 @@ nfsrv_write(nfsd, slp, procp, mrq) *tl++ = txdr_unsigned(stable); else *tl++ = txdr_unsigned(NFSV3WRITE_FILESYNC); - /* - * Actually, there is no need to txdr these fields, - * but it may make the values more human readable, - * for debugging purposes. - */ + /* write verifier */ *tl++ = txdr_unsigned(boottime_sec()); *tl = txdr_unsigned(0); } else { @@ -1468,11 +1471,7 @@ loop1: nfsm_build(tl, u_long *, 4 * NFSX_UNSIGNED); *tl++ = txdr_unsigned(nfsd->nd_len); *tl++ = txdr_unsigned(swp->nd_stable); - /* - * Actually, there is no need to txdr these fields, - * but it may make the values more human readable, - * for debugging purposes. - */ + /* write verifier */ *tl++ = txdr_unsigned(boottime_sec()); *tl = txdr_unsigned(0); } else { @@ -1598,7 +1597,10 @@ nfsrvw_sort(list, num) /* * copy credentials making sure that the result can be compared with bcmp(). * - * XXX ILLEGAL + * NOTE: This function is only intended to operate on a real input + * credential and a template output credential; the template + * ouptut credential is intended to then be used as an argument + * to kauth_cred_create() - AND NEVER REFERENCED OTHERWISE. */ void nfsrv_setcred(kauth_cred_t incred, kauth_cred_t outcred) @@ -1606,7 +1608,6 @@ nfsrv_setcred(kauth_cred_t incred, kauth_cred_t outcred) int i; bzero((caddr_t)outcred, sizeof (*outcred)); - outcred->cr_ref = 1; outcred->cr_uid = kauth_cred_getuid(incred); outcred->cr_ngroups = incred->cr_ngroups; for (i = 0; i < incred->cr_ngroups; i++) @@ -1852,6 +1853,7 @@ nfsrv_create(nfsd, slp, procp, mrq) if (!error) { if (nd.ni_cnd.cn_flags & ISSYMLINK) error = EINVAL; + vp = nd.ni_vp; } if (error) nfsm_reply(0); @@ -1973,8 +1975,6 @@ nfsrv_mknod(nfsd, slp, procp, mrq) context.vc_proc = procp; context.vc_ucred = nfsd->nd_cr; - hacked_context.vc_proc = procp; - hacked_context.vc_ucred = proc_ucred(procp); /* * Save the original credential UID in case they are @@ -2095,6 +2095,9 @@ nfsrv_mknod(nfsd, slp, procp, mrq) vnode_put(vp); vp = NULL; } + hacked_context.vc_proc = procp; + hacked_context.vc_ucred = kauth_cred_proc_ref(procp); + nd.ni_cnd.cn_nameiop = LOOKUP; nd.ni_cnd.cn_flags &= ~LOCKPARENT; nd.ni_cnd.cn_context = &hacked_context; @@ -2106,6 +2109,7 @@ nfsrv_mknod(nfsd, slp, procp, mrq) if (nd.ni_cnd.cn_flags & ISSYMLINK) error = EINVAL; } + kauth_cred_unref(&hacked_context.vc_ucred); } out1: if (xacl != NULL) @@ -2353,9 +2357,9 @@ retry: /* reset credential if it was remapped */ if (nfsd->nd_cr != saved_cred) { - kauth_cred_rele(nfsd->nd_cr); + kauth_cred_ref(saved_cred); + kauth_cred_unref(&nfsd->nd_cr); nfsd->nd_cr = saved_cred; - kauth_cred_ref(nfsd->nd_cr); } tond.ni_cnd.cn_nameiop = RENAME; @@ -2719,7 +2723,7 @@ out: if (topath) FREE_ZONE(topath, MAXPATHLEN, M_NAMEI); if (saved_cred) - kauth_cred_rele(saved_cred); + kauth_cred_unref(&saved_cred); return (0); nfsmout: @@ -2758,7 +2762,7 @@ nfsmout: if (topath) FREE_ZONE(topath, MAXPATHLEN, M_NAMEI); if (saved_cred) - kauth_cred_rele(saved_cred); + kauth_cred_unref(&saved_cred); return (error); } @@ -3725,6 +3729,7 @@ nfsrv_readdirplus(nfsd, slp, procp, mrq) vnode_t vp, nvp; struct flrep fl; struct nfs_filehandle dnfh, *nfhp = (struct nfs_filehandle *)&fl.fl_fhsize; + u_long fhsize; struct nfs_export *nx; struct nfs_export_options *nxo; uio_t auio; @@ -3936,7 +3941,8 @@ again: */ fp = (struct nfs_fattr *)&fl.fl_fattr; nfsm_srvfillattr(vap, fp); - fl.fl_fhsize = txdr_unsigned(nfhp->nfh_len); + fhsize = nfhp->nfh_len; + fl.fl_fhsize = txdr_unsigned(fhsize); fl.fl_fhok = nfs_true; fl.fl_postopok = nfs_true; if (vnopflag & VNODE_READDIR_SEEKOFF32) @@ -3981,7 +3987,7 @@ again: /* * Now copy the flrep structure out. */ - xfer = sizeof(struct flrep) - sizeof(fl.fl_nfh) + fl.fl_fhsize; + xfer = sizeof(struct flrep) - sizeof(fl.fl_nfh) + fhsize; cp = (caddr_t)&fl; while (xfer > 0) { nfsm_clget;