X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/4452a7af2eac33dbad800bcc91f2399d62c18f53..b0d623f7f2ae71ed96e60569f61f9a9a27016e80:/bsd/kern/posix_shm.c diff --git a/bsd/kern/posix_shm.c b/bsd/kern/posix_shm.c index f5f71f022..985538e69 100644 --- a/bsd/kern/posix_shm.c +++ b/bsd/kern/posix_shm.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000-2004 Apple Computer, Inc. All rights reserved. + * Copyright (c) 2000-2007 Apple Inc. All rights reserved. * * @APPLE_OSREFERENCE_LICENSE_HEADER_START@ * @@ -40,6 +40,12 @@ * Created for MacOSX * */ +/* + * NOTICE: This file was modified by SPARTA, Inc. in 2005 to introduce + * support for mandatory and extensible security protections. This notice + * is included in support of clause 2.2 (b) of the Apple Public License, + * Version 2.0. + */ #include #include @@ -53,6 +59,7 @@ #include #include #include +#include #include #include #include @@ -60,8 +67,11 @@ #include #include #include +#include -#include +#if CONFIG_MACF +#include +#endif #include #include @@ -73,11 +83,6 @@ #include #include -#include - -#if KTRACE -#include -#endif #define f_flag f_fglob->fg_flag #define f_type f_fglob->fg_type @@ -88,6 +93,11 @@ #define f_data f_fglob->fg_data #define PSHMNAMLEN 31 /* maximum name segment length we bother with */ +struct pshmobj { + void * pshmo_memobject; + memory_object_size_t pshmo_size; + struct pshmobj * pshmo_next; +}; struct pshminfo { unsigned int pshm_flags; @@ -97,23 +107,25 @@ struct pshminfo { uid_t pshm_uid; gid_t pshm_gid; char pshm_name[PSHMNAMLEN + 1]; /* segment name */ - void * pshm_memobject; + struct pshmobj *pshm_memobjects; #if DIAGNOSTIC unsigned int pshm_readcount; unsigned int pshm_writecount; - struct proc * pshm_proc; + proc_t pshm_proc; #endif /* DIAGNOSTIC */ + struct label* pshm_label; }; #define PSHMINFO_NULL (struct pshminfo *)0 -#define PSHM_NONE 1 -#define PSHM_DEFINED 2 -#define PSHM_ALLOCATED 4 -#define PSHM_MAPPED 8 -#define PSHM_INUSE 0x10 -#define PSHM_REMOVED 0x20 -#define PSHM_INCREATE 0x40 -#define PSHM_INDELETE 0x80 +#define PSHM_NONE 0x001 +#define PSHM_DEFINED 0x002 +#define PSHM_ALLOCATED 0x004 +#define PSHM_MAPPED 0x008 +#define PSHM_INUSE 0x010 +#define PSHM_REMOVED 0x020 +#define PSHM_INCREATE 0x040 +#define PSHM_INDELETE 0x080 +#define PSHM_ALLOCATING 0x100 struct pshmcache { LIST_ENTRY(pshmcache) pshm_hash; /* hash chain */ @@ -140,7 +152,7 @@ struct pshmname { struct pshmnode { off_t mapp_addr; - user_size_t map_size; + user_size_t map_size; /* XXX unused ? */ struct pshminfo *pinfo; unsigned int pshm_usecount; #if DIAGNOSTIC @@ -160,18 +172,18 @@ long pshmnument; /* number of cache entries allocated */ struct pshmstats pshmstats; /* cache effectiveness statistics */ static int pshm_read (struct fileproc *fp, struct uio *uio, - kauth_cred_t cred, int flags, struct proc *p); + int flags, vfs_context_t ctx); static int pshm_write (struct fileproc *fp, struct uio *uio, - kauth_cred_t cred, int flags, struct proc *p); + int flags, vfs_context_t ctx); static int pshm_ioctl (struct fileproc *fp, u_long com, - caddr_t data, struct proc *p); -static int pshm_select (struct fileproc *fp, int which, void *wql, struct proc *p); + caddr_t data, vfs_context_t ctx); +static int pshm_select (struct fileproc *fp, int which, void *wql, vfs_context_t ctx); static int pshm_close(struct pshmnode *pnode); -static int pshm_closefile (struct fileglob *fg, struct proc *p); +static int pshm_closefile (struct fileglob *fg, vfs_context_t ctx); -static int pshm_kqfilter(struct fileproc *fp, struct knote *kn, struct proc *p); +static int pshm_kqfilter(struct fileproc *fp, struct knote *kn, vfs_context_t ctx); -int pshm_access(struct pshminfo *pinfo, int mode, kauth_cred_t cred, struct proc *p); +int pshm_access(struct pshminfo *pinfo, int mode, kauth_cred_t cred, proc_t p); static int pshm_cache_add(struct pshminfo *pshmp, struct pshmname *pnp, struct pshmcache *pcp); static void pshm_cache_delete(struct pshmcache *pcp); #if NOT_USED @@ -269,7 +281,7 @@ pshm_cache_add(struct pshminfo *pshmp, struct pshmname *pnp, struct pshmcache *p struct pshmcache *dpcp; #if DIAGNOSTIC - if (pnp->pshm_namelen > NCHNAMLEN) + if (pnp->pshm_namelen > PSHMNAMLEN) panic("cache_enter: name too long"); #endif @@ -309,7 +321,7 @@ pshm_cache_add(struct pshminfo *pshmp, struct pshmname *pnp, struct pshmcache *p void pshm_cache_init(void) { - pshmhashtbl = hashinit(desiredvnodes, M_SHM, &pshmhash); + pshmhashtbl = hashinit(desiredvnodes / 8, M_SHM, &pshmhash); } #if NOT_USED @@ -350,34 +362,38 @@ pshm_cache_delete(struct pshmcache *pcp) int -shm_open(struct proc *p, struct shm_open_args *uap, register_t *retval) +shm_open(proc_t p, struct shm_open_args *uap, int32_t *retval) { - struct fileproc *fp; size_t i; - struct fileproc *nfp; int indx, error; struct pshmname nd; struct pshminfo *pinfo; - char * pnbuf; + struct fileproc *fp = NULL; + char *pnbuf = NULL; + struct pshminfo *new_pinfo = PSHMINFO_NULL; + struct pshmnode *new_pnode = PSHMNODE_NULL; + struct pshmcache *pcache = PSHMCACHE_NULL; /* ignored on return */ char * nameptr; char * cp; size_t pathlen, plen; int fmode ; int cmode = uap->mode; int incache = 0; - struct pshmnode * pnode = PSHMNODE_NULL; - struct pshmcache * pcache = PSHMCACHE_NULL; - struct pshmcache *pcp; - int pinfo_alloc=0; + struct pshmcache *pcp = NULL; AUDIT_ARG(fflags, uap->oflag); AUDIT_ARG(mode, uap->mode); pinfo = PSHMINFO_NULL; + /* + * Preallocate everything we might need up front to avoid taking + * and dropping the lock, opening us up to race conditions. + */ MALLOC_ZONE(pnbuf, caddr_t, MAXPATHLEN, M_NAMEI, M_WAITOK); if (pnbuf == NULL) { - return(ENOSPC); + error = ENOSPC; + goto bad; } pathlen = MAXPATHLEN; @@ -390,8 +406,6 @@ shm_open(struct proc *p, struct shm_open_args *uap, register_t *retval) error = ENAMETOOLONG; goto bad; } - - #ifdef PSXSHM_NAME_RESTRICT nameptr = pnbuf; if (*nameptr == '/') { @@ -400,7 +414,7 @@ shm_open(struct proc *p, struct shm_open_args *uap, register_t *retval) error = EINVAL; goto bad; } - } else { + } else { error = EINVAL; goto bad; } @@ -412,22 +426,51 @@ shm_open(struct proc *p, struct shm_open_args *uap, register_t *retval) nd.pshm_namelen = plen; nd. pshm_hash =0; - for (cp = nameptr, i=1; *cp != 0 && i <= plen; i++, cp++) { - nd.pshm_hash += (unsigned char)*cp * i; + for (cp = nameptr, i=1; *cp != 0 && i <= plen; i++, cp++) { + nd.pshm_hash += (unsigned char)*cp * i; + } + + /* + * attempt to allocate a new fp; if unsuccessful, the fp will be + * left unmodified (NULL). + */ + error = falloc(p, &fp, &indx, vfs_context_current()); + if (error) + goto bad; + + /* + * We allocate a new entry if we are less than the maximum + * allowed and the one at the front of the LRU list is in use. + * Otherwise we use the one at the front of the LRU list. + */ + MALLOC(pcp, struct pshmcache *, sizeof(struct pshmcache), M_SHM, M_WAITOK|M_ZERO); + if (pcp == NULL) { + error = ENOSPC; + goto bad; } -#if KTRACE - if (KTRPOINT(p, KTR_NAMEI)) - ktrnamei(p->p_tracep, nameptr); + MALLOC(new_pinfo, struct pshminfo *, sizeof(struct pshminfo), M_SHM, M_WAITOK|M_ZERO); + if (new_pinfo == PSHMINFO_NULL) { + error = ENOSPC; + goto bad; + } +#if CONFIG_MACF + mac_posixshm_label_init(new_pinfo); #endif - + + MALLOC(new_pnode, struct pshmnode *, sizeof(struct pshmnode), M_SHM, M_WAITOK|M_ZERO); + if (new_pnode == PSHMNODE_NULL) { + error = ENOSPC; + goto bad; + } + PSHM_SUBSYS_LOCK(); + error = pshm_cache_search(&pinfo, &nd, &pcache); if (error == ENOENT) { - PSHM_SUBSYS_UNLOCK(); error = EINVAL; - goto bad; + goto bad_locked; } if (!error) { @@ -436,92 +479,80 @@ shm_open(struct proc *p, struct shm_open_args *uap, register_t *retval) incache = 1; fmode = FFLAGS(uap->oflag); if ((fmode & (FREAD | FWRITE))==0) { - PSHM_SUBSYS_UNLOCK(); error = EINVAL; - goto bad; + goto bad_locked; } - /* - * XXXXXXXXXX TBD XXXXXXXXXX - * There is a race that existed with the funnels as well. - * Need to be fixed later - */ - PSHM_SUBSYS_UNLOCK(); - error = falloc(p, &nfp, &indx); - if (error ) - goto bad; - PSHM_SUBSYS_LOCK(); - - fp = nfp; - cmode &= ALLPERMS; if (fmode & O_CREAT) { - if ((fmode & O_EXCL) && incache) { + if (incache) { + /* already exists */ + if ((fmode & O_EXCL)) { + AUDIT_ARG(posix_ipc_perm, pinfo->pshm_uid, + pinfo->pshm_gid, + pinfo->pshm_mode); + + /* shm obj exists and opened O_EXCL */ + error = EEXIST; + goto bad_locked; + } + + if( pinfo->pshm_flags & PSHM_INDELETE) { + error = ENOENT; + goto bad_locked; + } AUDIT_ARG(posix_ipc_perm, pinfo->pshm_uid, - pinfo->pshm_gid, pinfo->pshm_mode); - - /* shm obj exists and opened O_EXCL */ -#if notyet - if (pinfo->pshm_flags & PSHM_INDELETE) { - } -#endif - error = EEXIST; - PSHM_SUBSYS_UNLOCK(); - goto bad1; - } - if (!incache) { - PSHM_SUBSYS_UNLOCK(); - /* create a new one */ - MALLOC(pinfo, struct pshminfo *, sizeof(struct pshminfo), M_SHM, M_WAITOK|M_ZERO); - if (pinfo == NULL) { - error = ENOSPC; - goto bad1; - } - PSHM_SUBSYS_LOCK(); - pinfo_alloc = 1; - pinfo->pshm_flags = PSHM_DEFINED | PSHM_INCREATE; - pinfo->pshm_usecount = 1; /* existence reference */ - pinfo->pshm_mode = cmode; - pinfo->pshm_uid = kauth_cred_getuid(kauth_cred_get()); - pinfo->pshm_gid = kauth_cred_get()->cr_gid; + pinfo->pshm_gid, pinfo->pshm_mode); +#if CONFIG_MACF + if ((error = mac_posixshm_check_open(kauth_cred_get(), pinfo))) { + goto bad_locked; + } +#endif + if ( (error = pshm_access(pinfo, fmode, kauth_cred_get(), p)) ) { + goto bad_locked; + } + } else { + /* create a new one (commit the allocation) */ + pinfo = new_pinfo; + pinfo->pshm_flags = PSHM_DEFINED | PSHM_INCREATE; + pinfo->pshm_usecount = 1; /* existence reference */ + pinfo->pshm_mode = cmode; + pinfo->pshm_uid = kauth_cred_getuid(kauth_cred_get()); + pinfo->pshm_gid = kauth_cred_get()->cr_gid; bcopy(pnbuf, &pinfo->pshm_name[0], PSHMNAMLEN); pinfo->pshm_name[PSHMNAMLEN]=0; - } else { - /* already exists */ - if( pinfo->pshm_flags & PSHM_INDELETE) { - PSHM_SUBSYS_UNLOCK(); - error = ENOENT; - goto bad1; - } - AUDIT_ARG(posix_ipc_perm, pinfo->pshm_uid, - pinfo->pshm_gid, pinfo->pshm_mode); - if ( (error = pshm_access(pinfo, fmode, kauth_cred_get(), p)) ) { - PSHM_SUBSYS_UNLOCK(); - goto bad1; - } - } +#if CONFIG_MACF + error = mac_posixshm_check_create(kauth_cred_get(), nameptr); + if (error) { + goto bad_locked; + } + mac_posixshm_label_associate(kauth_cred_get(), pinfo, nameptr); +#endif + } } else { if (!incache) { - /* O_CREAT is not set and the shm obecj does not exist */ - PSHM_SUBSYS_UNLOCK(); + /* O_CREAT is not set and the object does not exist */ error = ENOENT; - goto bad1; + goto bad_locked; } if( pinfo->pshm_flags & PSHM_INDELETE) { - PSHM_SUBSYS_UNLOCK(); error = ENOENT; - goto bad1; + goto bad_locked; } - if ( (error = pshm_access(pinfo, fmode, kauth_cred_get(), p)) ) { - PSHM_SUBSYS_UNLOCK(); - goto bad1; +#if CONFIG_MACF + if ((error = mac_posixshm_check_open(kauth_cred_get(), pinfo))) { + goto bad_locked; + } +#endif + + if ((error = pshm_access(pinfo, fmode, kauth_cred_get(), p))) { + goto bad_locked; } } if (fmode & O_TRUNC) { - PSHM_SUBSYS_UNLOCK(); error = EINVAL; - goto bad2; + goto bad_locked; } #if DIAGNOSTIC if (fmode & FWRITE) @@ -529,75 +560,84 @@ shm_open(struct proc *p, struct shm_open_args *uap, register_t *retval) if (fmode & FREAD) pinfo->pshm_readcount++; #endif - PSHM_SUBSYS_UNLOCK(); - MALLOC(pnode, struct pshmnode *, sizeof(struct pshmnode), M_SHM, M_WAITOK|M_ZERO); - if (pnode == NULL) { - error = ENOSPC; - goto bad2; - } - if (!incache) { - /* - * We allocate a new entry if we are less than the maximum - * allowed and the one at the front of the LRU list is in use. - * Otherwise we use the one at the front of the LRU list. - */ - MALLOC(pcp, struct pshmcache *, sizeof(struct pshmcache), M_SHM, M_WAITOK|M_ZERO); - if (pcp == NULL) { - error = ENOSPC; - goto bad2; - } - - } - PSHM_SUBSYS_LOCK(); - if (!incache) { + /* if successful, this will consume the pcp */ if ( (error = pshm_cache_add(pinfo, &nd, pcp)) ) { - PSHM_SUBSYS_UNLOCK(); - FREE(pcp, M_SHM); - goto bad3; + goto bad_locked; } } pinfo->pshm_flags &= ~PSHM_INCREATE; pinfo->pshm_usecount++; /* extra reference for the new fd */ - pnode->pinfo = pinfo; + new_pnode->pinfo = pinfo; PSHM_SUBSYS_UNLOCK(); + + /* + * if incache, we did not use the new pcp or new_pinfo and must + * free them + */ + if (incache) { + FREE(pcp, M_SHM); + + if (new_pinfo != PSHMINFO_NULL) { +#if CONFIG_MACF + mac_posixshm_label_destroy(new_pinfo); +#endif + FREE(new_pinfo, M_SHM); + } + } + proc_fdlock(p); fp->f_flag = fmode & FMASK; fp->f_type = DTYPE_PSXSHM; fp->f_ops = &pshmops; - fp->f_data = (caddr_t)pnode; - *fdflags(p, indx) &= ~UF_RESERVED; + fp->f_data = (caddr_t)new_pnode; + *fdflags(p, indx) |= UF_EXCLOSE; + procfdtbl_releasefd(p, indx, NULL); fp_drop(p, indx, fp, 1); proc_fdunlock(p); *retval = indx; FREE_ZONE(pnbuf, MAXPATHLEN, M_NAMEI); return (0); -bad3: - FREE(pnode, M_SHM); - -bad2: - if (pinfo_alloc) - FREE(pinfo, M_SHM); -bad1: - fp_free(p, indx, fp); + +bad_locked: + PSHM_SUBSYS_UNLOCK(); bad: - FREE_ZONE(pnbuf, MAXPATHLEN, M_NAMEI); + if (pcp != NULL) + FREE(pcp, M_SHM); + + if (new_pnode != PSHMNODE_NULL) + FREE(new_pnode, M_SHM); + + if (fp != NULL) + fp_free(p, indx, fp); + + if (new_pinfo != PSHMINFO_NULL) { +#if CONFIG_MACF + mac_posixshm_label_destroy(new_pinfo); +#endif + FREE(new_pinfo, M_SHM); + } + if (pnbuf != NULL) + FREE_ZONE(pnbuf, MAXPATHLEN, M_NAMEI); return (error); } int -pshm_truncate(__unused struct proc *p, struct fileproc *fp, __unused int fd, - off_t length, __unused register_t *retval) +pshm_truncate(__unused proc_t p, struct fileproc *fp, __unused int fd, + off_t length, __unused int32_t *retval) { struct pshminfo * pinfo; struct pshmnode * pnode ; kern_return_t kret; - mach_vm_offset_t user_addr; mem_entry_name_port_t mem_object; - mach_vm_size_t size; + mach_vm_size_t size, total_size, alloc_size; + struct pshmobj *pshmobj, *pshmobj_next, **pshmobj_next_p; +#if CONFIG_MACF + int error; +#endif if (fp->f_type != DTYPE_PSXSHM) { return(EINVAL); @@ -612,35 +652,78 @@ pshm_truncate(__unused struct proc *p, struct fileproc *fp, __unused int fd, PSHM_SUBSYS_UNLOCK(); return(EINVAL); } - if ((pinfo->pshm_flags & (PSHM_DEFINED | PSHM_ALLOCATED)) + if ((pinfo->pshm_flags & (PSHM_DEFINED|PSHM_ALLOCATING|PSHM_ALLOCATED)) != PSHM_DEFINED) { PSHM_SUBSYS_UNLOCK(); return(EINVAL); } +#if CONFIG_MACF + error = mac_posixshm_check_truncate(kauth_cred_get(), pinfo, size); + if (error) { + PSHM_SUBSYS_UNLOCK(); + return(error); + } +#endif - PSHM_SUBSYS_UNLOCK(); - size = round_page_64(length); - kret = mach_vm_allocate(current_map(), &user_addr, size, VM_FLAGS_ANYWHERE); - if (kret != KERN_SUCCESS) - goto out; + pinfo->pshm_flags |= PSHM_ALLOCATING; + total_size = round_page_64(length); + pshmobj_next_p = &pinfo->pshm_memobjects; - kret = mach_make_memory_entry_64 (current_map(), &size, - user_addr, VM_PROT_DEFAULT, &mem_object, 0); + for (alloc_size = 0; + alloc_size < total_size; + alloc_size += size) { - if (kret != KERN_SUCCESS) - goto out; - - mach_vm_deallocate(current_map(), user_addr, size); + PSHM_SUBSYS_UNLOCK(); - PSHM_SUBSYS_LOCK(); - pinfo->pshm_flags &= ~PSHM_DEFINED; + size = MIN(total_size - alloc_size, ANON_MAX_SIZE); + kret = mach_make_memory_entry_64( + VM_MAP_NULL, + &size, + 0, + MAP_MEM_NAMED_CREATE | VM_PROT_DEFAULT, + &mem_object, + 0); + + if (kret != KERN_SUCCESS) + goto out; + + MALLOC(pshmobj, struct pshmobj *, sizeof (struct pshmobj), + M_SHM, M_WAITOK); + if (pshmobj == NULL) { + kret = KERN_NO_SPACE; + mach_memory_entry_port_release(mem_object); + mem_object = NULL; + goto out; + } + + PSHM_SUBSYS_LOCK(); + + pshmobj->pshmo_memobject = (void *) mem_object; + pshmobj->pshmo_size = size; + pshmobj->pshmo_next = NULL; + + *pshmobj_next_p = pshmobj; + pshmobj_next_p = &pshmobj->pshmo_next; + } + pinfo->pshm_flags = PSHM_ALLOCATED; - pinfo->pshm_memobject = (void *)mem_object; - pinfo->pshm_length = size; + pinfo->pshm_length = total_size; PSHM_SUBSYS_UNLOCK(); return(0); out: + PSHM_SUBSYS_LOCK(); + for (pshmobj = pinfo->pshm_memobjects; + pshmobj != NULL; + pshmobj = pshmobj_next) { + pshmobj_next = pshmobj->pshmo_next; + mach_memory_entry_port_release(pshmobj->pshmo_memobject); + FREE(pshmobj, M_SHM); + } + pinfo->pshm_memobjects = NULL; + pinfo->pshm_flags &= ~PSHM_ALLOCATING; + PSHM_SUBSYS_UNLOCK(); + switch (kret) { case KERN_INVALID_ADDRESS: case KERN_NO_SPACE: @@ -654,9 +737,14 @@ out: } int -pshm_stat(struct pshmnode *pnode, struct stat *sb) +pshm_stat(struct pshmnode *pnode, void *ub, int isstat64) { + struct stat *sb = (struct stat *)0; /* warning avoidance ; protected by isstat64 */ + struct stat64 * sb64 = (struct stat64 *)0; /* warning avoidance ; protected by isstat64 */ struct pshminfo *pinfo; +#if CONFIG_MACF + int error; +#endif PSHM_SUBSYS_LOCK(); if ((pinfo = pnode->pinfo) == PSHMINFO_NULL){ @@ -664,11 +752,29 @@ pshm_stat(struct pshmnode *pnode, struct stat *sb) return(EINVAL); } - bzero(sb, sizeof(struct stat)); - sb->st_mode = pinfo->pshm_mode; - sb->st_uid = pinfo->pshm_uid; - sb->st_gid = pinfo->pshm_gid; - sb->st_size = pinfo->pshm_length; +#if CONFIG_MACF + error = mac_posixshm_check_stat(kauth_cred_get(), pinfo); + if (error) { + PSHM_SUBSYS_UNLOCK(); + return(error); + } +#endif + + if (isstat64 != 0) { + sb64 = (struct stat64 *)ub; + bzero(sb64, sizeof(struct stat64)); + sb64->st_mode = pinfo->pshm_mode; + sb64->st_uid = pinfo->pshm_uid; + sb64->st_gid = pinfo->pshm_gid; + sb64->st_size = pinfo->pshm_length; + } else { + sb = (struct stat *)ub; + bzero(sb, sizeof(struct stat)); + sb->st_mode = pinfo->pshm_mode; + sb->st_uid = pinfo->pshm_uid; + sb->st_gid = pinfo->pshm_gid; + sb->st_size = pinfo->pshm_length; + } PSHM_SUBSYS_UNLOCK(); return(0); @@ -679,7 +785,7 @@ pshm_stat(struct pshmnode *pnode, struct stat *sb) * XXX This code is repeated many times */ int -pshm_access(struct pshminfo *pinfo, int mode, kauth_cred_t cred, __unused struct proc *p) +pshm_access(struct pshminfo *pinfo, int mode, kauth_cred_t cred, __unused proc_t p) { mode_t mask; int is_member; @@ -717,21 +823,26 @@ pshm_access(struct pshminfo *pinfo, int mode, kauth_cred_t cred, __unused struct } int -pshm_mmap(struct proc *p, struct mmap_args *uap, user_addr_t *retval, struct fileproc *fp, off_t pageoff) +pshm_mmap(__unused proc_t p, struct mmap_args *uap, user_addr_t *retval, struct fileproc *fp, off_t pageoff) { mach_vm_offset_t user_addr = (mach_vm_offset_t)uap->addr; mach_vm_size_t user_size = (mach_vm_size_t)uap->len ; + mach_vm_offset_t user_start_addr; + mach_vm_size_t map_size, mapped_size; int prot = uap->prot; int flags = uap->flags; vm_object_offset_t file_pos = (vm_object_offset_t)uap->pos; - int fd = uap->fd; + vm_object_offset_t map_pos; vm_map_t user_map; int alloc_flags; boolean_t docow; kern_return_t kret; struct pshminfo * pinfo; struct pshmnode * pnode; - void * mem_object; + struct pshmobj * pshmobj; +#if CONFIG_MACF + int error; +#endif if (user_size == 0) return(0); @@ -765,11 +876,18 @@ pshm_mmap(struct proc *p, struct mmap_args *uap, user_addr_t *retval, struct fil PSHM_SUBSYS_UNLOCK(); return(EINVAL); } - if ((mem_object = pinfo->pshm_memobject) == NULL) { + if ((pshmobj = pinfo->pshm_memobjects) == NULL) { PSHM_SUBSYS_UNLOCK(); return(EINVAL); } +#if CONFIG_MACF + error = mac_posixshm_check_mmap(kauth_cred_get(), pinfo, prot, flags); + if (error) { + PSHM_SUBSYS_UNLOCK(); + return(error); + } +#endif PSHM_SUBSYS_UNLOCK(); user_map = current_map(); @@ -790,28 +908,78 @@ pshm_mmap(struct proc *p, struct mmap_args *uap, user_addr_t *retval, struct fil } docow = FALSE; - kret = mach_vm_map(user_map, &user_addr, user_size, - 0, alloc_flags, pinfo->pshm_memobject, file_pos, docow, - prot, VM_PROT_DEFAULT, - VM_INHERIT_SHARE); - if (kret != KERN_SUCCESS) - goto out; - /* LP64todo - this should be superfluous at this point */ - kret = mach_vm_inherit(user_map, user_addr, user_size, - VM_INHERIT_SHARE); + mapped_size = 0; + + /* reserver the entire space first... */ + kret = vm_map_enter_mem_object(user_map, + &user_addr, + user_size, + 0, + alloc_flags, + IPC_PORT_NULL, + 0, + FALSE, + VM_PROT_NONE, + VM_PROT_NONE, + VM_INHERIT_NONE); + user_start_addr = user_addr; if (kret != KERN_SUCCESS) { - (void) mach_vm_deallocate(user_map, user_addr, user_size); goto out; } + + /* ... and overwrite with the real mappings */ + for (map_pos = 0, pshmobj = pinfo->pshm_memobjects; + user_size != 0; + map_pos += pshmobj->pshmo_size, pshmobj = pshmobj->pshmo_next) { + if (pshmobj == NULL) { + /* nothing there to map !? */ + goto out; + } + if (file_pos >= map_pos + pshmobj->pshmo_size) { + continue; + } + map_size = pshmobj->pshmo_size - (file_pos - map_pos); + if (map_size > user_size) { + map_size = user_size; + } + kret = vm_map_enter_mem_object( + user_map, + &user_addr, + map_size, + 0, + VM_FLAGS_FIXED | VM_FLAGS_OVERWRITE, + pshmobj->pshmo_memobject, + file_pos - map_pos, + docow, + prot, + VM_PROT_DEFAULT, + VM_INHERIT_SHARE); + if (kret != KERN_SUCCESS) + goto out; + + user_addr += map_size; + user_size -= map_size; + mapped_size += map_size; + file_pos += map_size; + } + PSHM_SUBSYS_LOCK(); - pnode->mapp_addr = user_addr; - pnode->map_size = user_size; + pnode->mapp_addr = user_start_addr; + pnode->map_size = mapped_size; pinfo->pshm_flags |= (PSHM_MAPPED | PSHM_INUSE); PSHM_SUBSYS_UNLOCK(); out: + if (kret != KERN_SUCCESS) { + if (mapped_size != 0) { + (void) mach_vm_deallocate(current_map(), + user_start_addr, + mapped_size); + } + } + switch (kret) { case KERN_SUCCESS: - *retval = (user_addr + pageoff); + *retval = (user_start_addr + pageoff); return (0); case KERN_INVALID_ADDRESS: case KERN_NO_SPACE: @@ -825,8 +993,8 @@ out: } int -shm_unlink(__unused struct proc *p, struct shm_unlink_args *uap, - __unused register_t *retval) +shm_unlink(__unused proc_t p, struct shm_unlink_args *uap, + __unused int32_t *retval) { size_t i; int error=0; @@ -838,6 +1006,7 @@ shm_unlink(__unused struct proc *p, struct shm_unlink_args *uap, size_t pathlen, plen; int incache = 0; struct pshmcache *pcache = PSHMCACHE_NULL; + struct pshmobj *pshmobj, *pshmobj_next; pinfo = PSHMINFO_NULL; @@ -899,7 +1068,15 @@ shm_unlink(__unused struct proc *p, struct shm_unlink_args *uap, if ((pinfo->pshm_flags & (PSHM_DEFINED | PSHM_ALLOCATED))==0) { PSHM_SUBSYS_UNLOCK(); - return (EINVAL); + error = EINVAL; + goto bad; + } + + if (pinfo->pshm_flags & PSHM_ALLOCATING) { + /* XXX should we wait for flag to clear and then proceed ? */ + PSHM_SUBSYS_UNLOCK(); + error = EAGAIN; + goto bad; } if (pinfo->pshm_flags & PSHM_INDELETE) { @@ -907,6 +1084,13 @@ shm_unlink(__unused struct proc *p, struct shm_unlink_args *uap, error = 0; goto bad; } +#if CONFIG_MACF + error = mac_posixshm_check_unlink(kauth_cred_get(), pinfo, nameptr); + if (error) { + PSHM_SUBSYS_UNLOCK(); + goto bad; + } +#endif AUDIT_ARG(posix_ipc_perm, pinfo->pshm_uid, pinfo->pshm_gid, pinfo->pshm_mode); @@ -925,15 +1109,20 @@ shm_unlink(__unused struct proc *p, struct shm_unlink_args *uap, * If this is the last reference going away on the object, * then we need to destroy the backing object. The name * has an implied but uncounted reference on the object, - * once it's created, since it's used as a rendesvous, and + * once it's created, since it's used as a rendezvous, and * therefore may be subsequently reopened. */ - if (pinfo->pshm_memobject != NULL) - mach_memory_entry_port_release(pinfo->pshm_memobject); - PSHM_SUBSYS_LOCK(); + for (pshmobj = pinfo->pshm_memobjects; + pshmobj != NULL; + pshmobj = pshmobj_next) { + mach_memory_entry_port_release(pshmobj->pshmo_memobject); + pshmobj_next = pshmobj->pshmo_next; + FREE(pshmobj, M_SHM); + } FREE(pinfo,M_SHM); + } else { + PSHM_SUBSYS_UNLOCK(); } - PSHM_SUBSYS_UNLOCK(); FREE(pcache, M_SHM); error = 0; bad: @@ -947,6 +1136,7 @@ pshm_close(struct pshmnode *pnode) { int error=0; struct pshminfo *pinfo; + struct pshmobj *pshmobj, *pshmobj_next; if ((pinfo = pnode->pinfo) == PSHMINFO_NULL) return(EINVAL); @@ -962,13 +1152,21 @@ pshm_close(struct pshmnode *pnode) pinfo->pshm_usecount--; /* release this fd's reference */ if ((pinfo->pshm_flags & PSHM_REMOVED) && !pinfo->pshm_usecount) { +#if CONFIG_MACF + mac_posixshm_label_destroy(pinfo); +#endif PSHM_SUBSYS_UNLOCK(); /* * If this is the last reference going away on the object, * then we need to destroy the backing object. */ - if (pinfo->pshm_memobject != NULL) - mach_memory_entry_port_release(pinfo->pshm_memobject); + for (pshmobj = pinfo->pshm_memobjects; + pshmobj != NULL; + pshmobj = pshmobj_next) { + mach_memory_entry_port_release(pshmobj->pshmo_memobject); + pshmobj_next = pshmobj->pshmo_next; + FREE(pshmobj, M_SHM); + } PSHM_SUBSYS_LOCK(); FREE(pinfo,M_SHM); } @@ -976,9 +1174,9 @@ pshm_close(struct pshmnode *pnode) return (error); } -/* struct proc passed to match prototype for struct fileops */ +/* vfs_context_t passed to match prototype for struct fileops */ static int -pshm_closefile(struct fileglob *fg, __unused struct proc *p) +pshm_closefile(struct fileglob *fg, __unused vfs_context_t ctx) { int error; @@ -990,37 +1188,35 @@ pshm_closefile(struct fileglob *fg, __unused struct proc *p) static int pshm_read(__unused struct fileproc *fp, __unused struct uio *uio, - __unused kauth_cred_t cred, __unused int flags, - __unused struct proc *p) + __unused int flags, __unused vfs_context_t ctx) { return(ENOTSUP); } static int pshm_write(__unused struct fileproc *fp, __unused struct uio *uio, - __unused kauth_cred_t cred, __unused int flags, - __unused struct proc *p) + __unused int flags, __unused vfs_context_t ctx) { return(ENOTSUP); } static int pshm_ioctl(__unused struct fileproc *fp, __unused u_long com, - __unused caddr_t data, __unused struct proc *p) + __unused caddr_t data, __unused vfs_context_t ctx) { return(ENOTSUP); } static int pshm_select(__unused struct fileproc *fp, __unused int which, __unused void *wql, - __unused struct proc *p) + __unused vfs_context_t ctx) { return(ENOTSUP); } static int pshm_kqfilter(__unused struct fileproc *fp, __unused struct knote *kn, - __unused struct proc *p) + __unused vfs_context_t ctx) { return(ENOTSUP); } @@ -1029,7 +1225,7 @@ int fill_pshminfo(struct pshmnode * pshm, struct pshm_info * info) { struct pshminfo *pinfo; - struct stat *sb; + struct vinfo_stat *sb; PSHM_SUBSYS_LOCK(); if ((pinfo = pshm->pinfo) == PSHMINFO_NULL){ @@ -1039,11 +1235,11 @@ fill_pshminfo(struct pshmnode * pshm, struct pshm_info * info) sb = &info->pshm_stat; - bzero(sb, sizeof(struct stat)); - sb->st_mode = pinfo->pshm_mode; - sb->st_uid = pinfo->pshm_uid; - sb->st_gid = pinfo->pshm_gid; - sb->st_size = pinfo->pshm_length; + bzero(sb, sizeof(struct vinfo_stat)); + sb->vst_mode = pinfo->pshm_mode; + sb->vst_uid = pinfo->pshm_uid; + sb->vst_gid = pinfo->pshm_gid; + sb->vst_size = pinfo->pshm_length; info->pshm_mappaddr = pshm->mapp_addr; bcopy(&pinfo->pshm_name[0], &info->pshm_name[0], PSHMNAMLEN+1); @@ -1052,4 +1248,22 @@ fill_pshminfo(struct pshmnode * pshm, struct pshm_info * info) return(0); } +#if CONFIG_MACF +void +pshm_label_associate(struct fileproc *fp, struct vnode *vp, vfs_context_t ctx) +{ + struct pshmnode *pnode; + struct pshminfo *pshm; + PSHM_SUBSYS_LOCK(); + pnode = (struct pshmnode *)fp->f_fglob->fg_data; + if (pnode != NULL) { + pshm = pnode->pinfo; + if (pshm != NULL) + mac_posixshm_vnode_label_associate( + vfs_context_ucred(ctx), pshm, pshm->pshm_label, + vp, vp->v_label); + } + PSHM_SUBSYS_UNLOCK(); +} +#endif