/*
- * Copyright (c) 2006 Apple Computer, Inc. All Rights Reserved.
+ * Copyright (c) 2000-2006 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
*
- * @APPLE_LICENSE_OSREFERENCE_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. 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.
*
- * 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. 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
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
+ * 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
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
* limitations under the License.
- *
- * @APPLE_LICENSE_OSREFERENCE_HEADER_END@
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
*/
/*
#include "shadow.h"
+static void
+vndevice_do_init(void) __attribute__((section("__TEXT, initcode")));
static ioctl_fcn_t vnioctl_chr;
static ioctl_fcn_t vnioctl_blk;
/* ioctl */ vnioctl_chr,
/* stop */ eno_stop,
/* reset */ eno_reset,
- /* ttys */ 0,
+ /* ttys */ NULL,
/* select */ eno_select,
/* mmap */ eno_mmap,
/* strategy */ eno_strat,
u_int64_t sc_fsize; /* file size in bytes */
u_int64_t sc_size; /* size of vn, sc_secsize scale */
int sc_flags; /* flags */
- u_long sc_secsize; /* sector size */
+ u_int32_t sc_secsize; /* sector size */
struct vnode *sc_vp; /* vnode if not NULL */
uint32_t sc_vid;
int sc_open_flags;
struct vnode *sc_shadow_vp; /* shadow vnode if not NULL */
uint32_t sc_shadow_vid;
shadow_map_t * sc_shadow_map; /* shadow map if not NULL */
- kauth_cred_t sc_cred; /* credentials */
+ kauth_cred_t sc_cred; /* credentials */
u_int32_t sc_options; /* options */
void * sc_bdev;
void * sc_cdev;
#define IFOPT(vn,opt) if (((vn)->sc_options|vn_options) & (opt))
#define TESTOPT(vn,opt) (((vn)->sc_options|vn_options) & (opt))
-static int setcred(struct vnode * vp, struct proc * p,
- kauth_cred_t cred);
-static void vnclear (struct vn_softc *vn, struct proc * p);
-static void vn_ioctl_to_64(struct vn_ioctl *from, struct user_vn_ioctl *to);
+static int setcred(struct vnode * vp, kauth_cred_t cred);
+static void vnclear (struct vn_softc *vn, vfs_context_t ctx);
+static void vn_ioctl_to_64(struct vn_ioctl_32 *from, struct vn_ioctl_64 *to);
void vndevice_init(void);
int vndevice_root_image(char * path, char devname[], dev_t * dev_p);
static int
vniocattach_file(struct vn_softc *vn,
- struct user_vn_ioctl *vniop,
+ struct vn_ioctl_64 *vniop,
dev_t dev,
int in_kernel,
- struct proc *p);
+ proc_t p);
static int
vniocattach_shadow(struct vn_softc * vn,
- struct user_vn_ioctl *vniop,
+ struct vn_ioctl_64 *vniop,
dev_t dev,
int in_kernel,
- struct proc *p);
+ proc_t p);
static __inline__ int
vnunit(dev_t dev)
{
static int
vnclose(__unused dev_t dev, __unused int flags,
- __unused int devtype, __unused struct proc *p)
+ __unused int devtype, __unused proc_t p)
{
return (0);
}
static int
-vnopen(dev_t dev, int flags, __unused int devtype, __unused struct proc *p)
+vnopen(dev_t dev, int flags, __unused int devtype, __unused proc_t p)
{
struct vn_softc *vn;
int unit;
}
static int
-file_io(struct vnode * vp, struct vfs_context * context_p,
+file_io(struct vnode * vp, vfs_context_t ctx,
enum uio_rw op, char * base, off_t offset, user_ssize_t count,
user_ssize_t * resid)
{
&uio_buf[0], sizeof(uio_buf));
uio_addiov(auio, CAST_USER_ADDR_T(base), count);
if (op == UIO_READ)
- error = VNOP_READ(vp, auio, IO_SYNC, context_p);
+ error = VNOP_READ(vp, auio, IO_SYNC, ctx);
else
- error = VNOP_WRITE(vp, auio, IO_SYNC, context_p);
+ error = VNOP_WRITE(vp, auio, IO_SYNC, ctx);
if (resid != NULL) {
*resid = uio_resid(auio);
static int
vnread_shadow(struct vn_softc * vn, struct uio *uio, int ioflag,
- struct vfs_context * context_p)
+ vfs_context_t ctx)
{
- u_long blocksize = vn->sc_secsize;
+ u_int32_t blocksize = vn->sc_secsize;
int error = 0;
off_t offset;
user_ssize_t resid;
orig_offset = offset = uio_offset(uio);
while (resid > 0) {
- u_long remainder;
- u_long this_block_number;
- u_long this_block_count;
+ u_int32_t remainder;
+ u_int32_t this_block_number;
+ u_int32_t this_block_count;
off_t this_offset;
user_ssize_t this_resid;
struct vnode * vp;
this_resid = resid;
}
uio_setresid(uio, this_resid);
- error = VNOP_READ(vp, uio, ioflag, context_p);
+ error = VNOP_READ(vp, uio, ioflag, ctx);
if (error) {
break;
}
}
static int
-vncopy_block_to_shadow(struct vn_softc * vn, struct vfs_context * context_p,
- u_long file_block, u_long shadow_block)
+vncopy_block_to_shadow(struct vn_softc * vn, vfs_context_t ctx,
+ u_int32_t file_block, u_int32_t shadow_block)
{
int error;
char * tmpbuf;
return (ENOMEM);
}
/* read one block from file at file_block offset */
- error = file_io(vn->sc_vp, context_p, UIO_READ,
+ error = file_io(vn->sc_vp, ctx, UIO_READ,
tmpbuf, (off_t)file_block * vn->sc_secsize,
vn->sc_secsize, NULL);
if (error) {
goto done;
}
/* write one block to shadow file at shadow_block offset */
- error = file_io(vn->sc_shadow_vp, context_p, UIO_WRITE,
+ error = file_io(vn->sc_shadow_vp, ctx, UIO_WRITE,
tmpbuf, (off_t)shadow_block * vn->sc_secsize,
vn->sc_secsize, NULL);
done:
static int
vnwrite_shadow(struct vn_softc * vn, struct uio *uio, int ioflag,
- struct vfs_context * context_p)
+ vfs_context_t ctx)
{
- u_long blocksize = vn->sc_secsize;
+ u_int32_t blocksize = vn->sc_secsize;
int error = 0;
user_ssize_t resid;
off_t offset;
while (resid > 0) {
int flags = 0;
- u_long offset_block_number;
- u_long remainder;
- u_long resid_block_count;
- u_long shadow_block_count;
- u_long shadow_block_number;
+ u_int32_t offset_block_number;
+ u_int32_t remainder;
+ u_int32_t resid_block_count;
+ u_int32_t shadow_block_count;
+ u_int32_t shadow_block_number;
user_ssize_t this_resid;
/* figure out which blocks to write */
off_t size;
size = (off_t)shadow_map_shadow_size(vn->sc_shadow_map)
* vn->sc_secsize;
- vnode_setsize(vn->sc_shadow_vp, size, IO_SYNC,
- context_p);
-#endif 0
+ vnode_setsize(vn->sc_shadow_vp, size, IO_SYNC, ctx);
+#endif
}
/* write the blocks (or parts thereof) */
uio_setoffset(uio, (off_t)
this_resid = resid;
if ((flags & FLAGS_LAST_BLOCK_PARTIAL) != 0) {
/* copy the last block to the shadow */
- u_long d;
- u_long s;
+ u_int32_t d;
+ u_int32_t s;
s = offset_block_number
+ resid_block_count - 1;
d = shadow_block_number
+ shadow_block_count - 1;
- error = vncopy_block_to_shadow(vn, context_p,
- s, d);
+ error = vncopy_block_to_shadow(vn, ctx, s, d);
if (error) {
printf("vnwrite_shadow: failed to copy"
- " block %d to shadow block %d\n",
+ " block %u to shadow block %u\n",
s, d);
break;
}
uio_setresid(uio, this_resid);
if ((flags & FLAGS_FIRST_BLOCK_PARTIAL) != 0) {
/* copy the first block to the shadow */
- error = vncopy_block_to_shadow(vn, context_p,
+ error = vncopy_block_to_shadow(vn, ctx,
offset_block_number,
shadow_block_number);
if (error) {
printf("vnwrite_shadow: failed to"
- " copy block %d to shadow block %d\n",
+ " copy block %u to shadow block %u\n",
offset_block_number,
shadow_block_number);
break;
}
}
- error = VNOP_WRITE(vn->sc_shadow_vp, uio, ioflag, context_p);
+ error = VNOP_WRITE(vn->sc_shadow_vp, uio, ioflag, ctx);
if (error) {
break;
}
int error = 0;
boolean_t funnel_state;
off_t offset;
- struct proc * p;
+ proc_t p;
user_ssize_t resid;
struct vn_softc * vn;
int unit;
error = ENXIO;
goto done;
}
+
+ context.vc_thread = current_thread();
+ context.vc_ucred = vn->sc_cred;
+
error = vnode_getwithvid(vn->sc_vp, vn->sc_vid);
if (error != 0) {
/* the vnode is no longer available, abort */
error = ENXIO;
- vnclear(vn, p);
+ vnclear(vn, &context);
goto done;
}
uio_setresid(uio, resid);
}
- context.vc_proc = p;
- context.vc_ucred = vn->sc_cred;
if (vn->sc_shadow_vp != NULL) {
error = vnode_getwithvid(vn->sc_shadow_vp,
vn->sc_shadow_vid);
/* the vnode is no longer available, abort */
error = ENXIO;
vnode_put(vn->sc_vp);
- vnclear(vn, p);
+ vnclear(vn, &context);
goto done;
}
error = vnread_shadow(vn, uio, ioflag, &context);
int error;
boolean_t funnel_state;
off_t offset;
- struct proc * p;
+ proc_t p;
user_ssize_t resid;
struct vn_softc * vn;
int unit;
error = EROFS;
goto done;
}
+
+ context.vc_thread = current_thread();
+ context.vc_ucred = vn->sc_cred;
+
error = vnode_getwithvid(vn->sc_vp, vn->sc_vid);
if (error != 0) {
/* the vnode is no longer available, abort */
error = ENXIO;
- vnclear(vn, p);
+ vnclear(vn, &context);
goto done;
}
resid = uio_resid(uio);
uio_setresid(uio, resid);
}
- context.vc_proc = p;
- context.vc_ucred = vn->sc_cred;
-
if (vn->sc_shadow_vp != NULL) {
error = vnode_getwithvid(vn->sc_shadow_vp,
vn->sc_shadow_vid);
/* the vnode is no longer available, abort */
error = ENXIO;
vnode_put(vn->sc_vp);
- vnclear(vn, p);
+ vnclear(vn, &context);
goto done;
}
error = vnwrite_shadow(vn, uio, ioflag, &context);
}
static int
-shadow_read(struct vn_softc * vn, struct buf * bp, char * base, struct proc * p)
+shadow_read(struct vn_softc * vn, struct buf * bp, char * base,
+ vfs_context_t ctx)
{
- u_long blocksize = vn->sc_secsize;
- struct vfs_context context;
+ u_int32_t blocksize = vn->sc_secsize;
int error = 0;
- u_long offset;
+ u_int32_t offset;
boolean_t read_shadow;
- u_long resid;
- u_long start = 0;
+ u_int32_t resid;
+ u_int32_t start = 0;
- context.vc_proc = p;
- context.vc_ucred = vn->sc_cred;
offset = buf_blkno(bp);
resid = buf_resid(bp) / blocksize;
while (resid > 0) {
user_ssize_t temp_resid;
- u_long this_offset;
- u_long this_resid;
+ u_int32_t this_offset;
+ u_int32_t this_resid;
struct vnode * vp;
read_shadow = shadow_map_read(vn->sc_shadow_map,
else {
vp = vn->sc_vp;
}
- error = file_io(vp, &context, UIO_READ, base + start,
+ error = file_io(vp, ctx, UIO_READ, base + start,
(off_t)this_offset * blocksize,
(user_ssize_t)this_resid * blocksize,
&temp_resid);
static int
shadow_write(struct vn_softc * vn, struct buf * bp, char * base,
- struct proc * p)
+ vfs_context_t ctx)
{
- u_long blocksize = vn->sc_secsize;
- struct vfs_context context;
+ u_int32_t blocksize = vn->sc_secsize;
int error = 0;
- u_long offset;
+ u_int32_t offset;
boolean_t shadow_grew;
- u_long resid;
- u_long start = 0;
+ u_int32_t resid;
+ u_int32_t start = 0;
- context.vc_proc = p;
- context.vc_ucred = vn->sc_cred;
offset = buf_blkno(bp);
resid = buf_resid(bp) / blocksize;
while (resid > 0) {
user_ssize_t temp_resid;
- u_long this_offset;
- u_long this_resid;
+ u_int32_t this_offset;
+ u_int32_t this_resid;
shadow_grew = shadow_map_write(vn->sc_shadow_map,
offset, resid,
/* truncate the file to its new length before write */
size = (off_t)shadow_map_shadow_size(vn->sc_shadow_map)
* blocksize;
- vnode_setsize(vn->sc_shadow_vp, size, IO_SYNC,
- &context);
+ vnode_setsize(vn->sc_shadow_vp, size, IO_SYNC, ctx);
#endif
}
- error = file_io(vn->sc_shadow_vp, &context, UIO_WRITE,
+ error = file_io(vn->sc_shadow_vp, ctx, UIO_WRITE,
base + start,
(off_t)this_offset * blocksize,
(user_ssize_t)this_resid * blocksize,
}
static int
-vn_readwrite_io(struct vn_softc * vn, struct buf * bp, struct proc * p)
+vn_readwrite_io(struct vn_softc * vn, struct buf * bp, vfs_context_t ctx)
{
int error = 0;
char * iov_base;
caddr_t vaddr;
-
if (buf_map(bp, &vaddr))
panic("vn device: buf_map failed");
iov_base = (char *)vaddr;
if (vn->sc_shadow_vp == NULL) {
- struct vfs_context context;
user_ssize_t temp_resid;
- context.vc_proc = p;
- context.vc_ucred = vn->sc_cred;
-
- error = file_io(vn->sc_vp, &context,
+ error = file_io(vn->sc_vp, ctx,
buf_flags(bp) & B_READ ? UIO_READ : UIO_WRITE,
iov_base,
(off_t)buf_blkno(bp) * vn->sc_secsize,
}
else {
if (buf_flags(bp) & B_READ)
- error = shadow_read(vn, bp, iov_base, p);
+ error = shadow_read(vn, bp, iov_base, ctx);
else
- error = shadow_write(vn, bp, iov_base, p);
+ error = shadow_write(vn, bp, iov_base, ctx);
}
buf_unmap(bp);
long sz; /* in sc_secsize chunks */
daddr64_t blk_num;
boolean_t funnel_state;
- struct proc * p = current_proc();
struct vnode * shadow_vp = NULL;
struct vnode * vp = NULL;
+ struct vfs_context context;
funnel_state = thread_funnel_set(kernel_flock, TRUE);
vn = vn_table + vnunit(buf_device(bp));
goto done;
}
+ context.vc_thread = current_thread();
+ context.vc_ucred = vn->sc_cred;
+
buf_setresid(bp, buf_count(bp));
/*
* Check for required alignment. Transfers must be a valid
error = ENXIO;
goto done;
}
+
error = vnode_getwithvid(vp, vn->sc_vid);
if (error != 0) {
/* the vnode is no longer available, abort */
error = ENXIO;
- vnclear(vn, p);
+ vnclear(vn, &context);
goto done;
}
shadow_vp = vn->sc_shadow_vp;
/* the vnode is no longer available, abort */
error = ENXIO;
vnode_put(vn->sc_vp);
- vnclear(vn, p);
+ vnclear(vn, &context);
goto done;
}
}
- error = vn_readwrite_io(vn, bp, p);
+
+ error = vn_readwrite_io(vn, bp, &context);
vnode_put(vp);
if (shadow_vp != NULL) {
vnode_put(shadow_vp);
/* ARGSUSED */
static int
vnioctl(dev_t dev, u_long cmd, caddr_t data,
- __unused int flag, struct proc *p,
+ __unused int flag, proc_t p,
int is_char)
{
struct vn_softc *vn;
- struct user_vn_ioctl *viop;
+ struct vn_ioctl_64 *viop;
int error;
u_int32_t *f;
u_int64_t * o;
int unit;
struct vfsioattr ioattr;
- struct user_vn_ioctl user_vnio;
+ struct vn_ioctl_64 user_vnio;
boolean_t funnel_state;
+ struct vfs_context context;
unit = vnunit(dev);
if (vnunit(dev) >= NVNDEVICE) {
goto done;
}
- viop = (struct user_vn_ioctl *)data;
+ context.vc_thread = current_thread();
+ context.vc_ucred = vn->sc_cred;
+
+ viop = (struct vn_ioctl_64 *)data;
f = (u_int32_t *)data;
o = (u_int64_t *)data;
switch (cmd) {
+#ifdef __LP64__
+ case VNIOCDETACH32:
+ case VNIOCDETACH:
+#else
case VNIOCDETACH:
case VNIOCDETACH64:
+#endif
case DKIOCGETBLOCKSIZE:
case DKIOCSETBLOCKSIZE:
case DKIOCGETMAXBLOCKCOUNTREAD:
case DKIOCGETBLOCKCOUNT:
*o = vn->sc_size;
break;
+#ifdef __LP64__
+ case VNIOCSHADOW32:
+ case VNIOCSHADOW:
+#else
case VNIOCSHADOW:
case VNIOCSHADOW64:
+#endif
if (vn->sc_shadow_vp != NULL) {
error = EBUSY;
break;
}
if (!proc_is64bit(p)) {
/* downstream code expects LP64 version of vn_ioctl structure */
- vn_ioctl_to_64((struct vn_ioctl *)viop, &user_vnio);
+ vn_ioctl_to_64((struct vn_ioctl_32 *)viop, &user_vnio);
viop = &user_vnio;
}
if (viop->vn_file == USER_ADDR_NULL) {
error = vniocattach_shadow(vn, viop, dev, 0, p);
break;
+#ifdef __LP64__
+ case VNIOCATTACH32:
+ case VNIOCATTACH:
+#else
case VNIOCATTACH:
case VNIOCATTACH64:
+#endif
if (is_char) {
/* attach only on block device */
error = ENODEV;
}
if (!proc_is64bit(p)) {
/* downstream code expects LP64 version of vn_ioctl structure */
- vn_ioctl_to_64((struct vn_ioctl *)viop, &user_vnio);
+ vn_ioctl_to_64((struct vn_ioctl_32 *)viop, &user_vnio);
viop = &user_vnio;
}
if (viop->vn_file == USER_ADDR_NULL) {
error = vniocattach_file(vn, viop, dev, 0, p);
break;
+#ifdef __LP64__
+ case VNIOCDETACH32:
+ case VNIOCDETACH:
+#else
case VNIOCDETACH:
case VNIOCDETACH64:
+#endif
if (is_char) {
/* detach only on block device */
error = ENODEV;
* How are these problems handled for removable and failing
* hardware devices? (Hint: They are not)
*/
- vnclear(vn, p);
+ vnclear(vn, &context);
break;
case VNIOCGSET:
}
static int
-vnioctl_chr(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
+vnioctl_chr(dev_t dev, u_long cmd, caddr_t data, int flag, proc_t p)
{
return (vnioctl(dev, cmd, data, flag, p, TRUE));
}
static int
-vnioctl_blk(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
+vnioctl_blk(dev_t dev, u_long cmd, caddr_t data, int flag, proc_t p)
{
return (vnioctl(dev, cmd, data, flag, p, FALSE));
}
static int
vniocattach_file(struct vn_softc *vn,
- struct user_vn_ioctl *vniop,
+ struct vn_ioctl_64 *vniop,
dev_t dev,
int in_kernel,
- struct proc *p)
+ proc_t p)
{
dev_t cdev;
- struct vfs_context context;
+ vfs_context_t ctx = vfs_context_current();
kauth_cred_t cred;
struct nameidata nd;
off_t file_size;
int error, flags;
- context.vc_proc = p;
- context.vc_ucred = proc_ucred(p);
-
flags = FREAD|FWRITE;
if (in_kernel) {
- NDINIT(&nd, LOOKUP, FOLLOW, UIO_SYSSPACE32, vniop->vn_file, &context);
+ NDINIT(&nd, LOOKUP, FOLLOW, UIO_SYSSPACE, vniop->vn_file, ctx);
}
else {
NDINIT(&nd, LOOKUP, FOLLOW,
(IS_64BIT_PROCESS(p) ? UIO_USERSPACE64 : UIO_USERSPACE32),
- vniop->vn_file, &context);
+ vniop->vn_file, ctx);
}
/* vn_open gives both long- and short-term references */
error = vn_open(&nd, flags, 0);
if (error) {
- if (error != EACCES && error != EPERM && error != EROFS)
+ if (error != EACCES && error != EPERM && error != EROFS) {
return (error);
+ }
flags &= ~FWRITE;
if (in_kernel) {
- NDINIT(&nd, LOOKUP, FOLLOW, UIO_SYSSPACE32,
- vniop->vn_file, &context);
+ NDINIT(&nd, LOOKUP, FOLLOW, UIO_SYSSPACE,
+ vniop->vn_file, ctx);
}
else {
NDINIT(&nd, LOOKUP, FOLLOW,
(IS_64BIT_PROCESS(p) ? UIO_USERSPACE64 : UIO_USERSPACE32),
- vniop->vn_file, &context);
+ vniop->vn_file, ctx);
}
error = vn_open(&nd, flags, 0);
- if (error)
+ if (error) {
return (error);
+ }
}
if (nd.ni_vp->v_type != VREG) {
error = EINVAL;
}
else {
- error = vnode_size(nd.ni_vp, &file_size, &context);
+ error = vnode_size(nd.ni_vp, &file_size, ctx);
}
if (error != 0) {
- (void) vn_close(nd.ni_vp, flags, proc_ucred(p), p);
+ (void) vn_close(nd.ni_vp, flags, ctx);
vnode_put(nd.ni_vp);
return (error);
}
cred = kauth_cred_proc_ref(p);
nd.ni_vp->v_flag |= VNOCACHE_DATA;
- error = setcred(nd.ni_vp, p, cred);
+ error = setcred(nd.ni_vp, cred);
if (error) {
- (void)vn_close(nd.ni_vp, flags, proc_ucred(p), p);
+ (void)vn_close(nd.ni_vp, flags, ctx);
vnode_put(nd.ni_vp);
- kauth_cred_rele(cred);
+ kauth_cred_unref(&cred);
return(error);
}
vn->sc_secsize = DEV_BSIZE;
}
static int
-vniocattach_shadow(struct vn_softc *vn, struct user_vn_ioctl *vniop,
- __unused int dev, int in_kernel, struct proc *p)
+vniocattach_shadow(struct vn_softc *vn, struct vn_ioctl_64 *vniop,
+ __unused dev_t dev, int in_kernel, proc_t p)
{
- struct vfs_context context;
+ vfs_context_t ctx = vfs_context_current();
struct nameidata nd;
int error, flags;
shadow_map_t * map;
off_t file_size;
- context.vc_proc = p;
- context.vc_ucred = proc_ucred(p);
-
flags = FREAD|FWRITE;
if (in_kernel) {
- NDINIT(&nd, LOOKUP, FOLLOW, UIO_SYSSPACE32, vniop->vn_file, &context);
+ NDINIT(&nd, LOOKUP, FOLLOW, UIO_SYSSPACE, vniop->vn_file, ctx);
}
else {
NDINIT(&nd, LOOKUP, FOLLOW,
(IS_64BIT_PROCESS(p) ? UIO_USERSPACE64 : UIO_USERSPACE32),
- vniop->vn_file, &context);
+ vniop->vn_file, ctx);
}
/* vn_open gives both long- and short-term references */
error = vn_open(&nd, flags, 0);
return (error);
}
if (nd.ni_vp->v_type != VREG
- || (error = vnode_size(nd.ni_vp, &file_size, &context))) {
- (void)vn_close(nd.ni_vp, flags, proc_ucred(p), p);
+ || (error = vnode_size(nd.ni_vp, &file_size, ctx))) {
+ (void)vn_close(nd.ni_vp, flags, ctx);
vnode_put(nd.ni_vp);
return (error ? error : EINVAL);
}
map = shadow_map_create(vn->sc_fsize, file_size,
0, vn->sc_secsize);
if (map == NULL) {
- (void)vn_close(nd.ni_vp, flags, proc_ucred(p), p);
+ (void)vn_close(nd.ni_vp, flags, ctx);
vnode_put(nd.ni_vp);
vn->sc_shadow_vp = NULL;
return (ENOMEM);
{
int error = 0;
struct vn_softc * vn;
- struct user_vn_ioctl vnio;
+ struct vn_ioctl_64 vnio;
vnio.vn_file = CAST_USER_ADDR_T(path);
vnio.vn_size = 0;
vn = vn_table + ROOT_IMAGE_UNIT;
*dev_p = makedev(vndevice_bdev_major,
ROOT_IMAGE_UNIT);
- sprintf(devname, "vn%d", ROOT_IMAGE_UNIT);
+ snprintf(devname, 16, "vn%d", ROOT_IMAGE_UNIT);
error = vniocattach_file(vn, &vnio, *dev_p, 1, current_proc());
return (error);
}
* if some other uid can write directly to the mapped file (NFS).
*/
static int
-setcred(struct vnode * vp, struct proc * p, kauth_cred_t cred)
+setcred(struct vnode * vp, kauth_cred_t cred)
{
char *tmpbuf;
int error = 0;
/*
* Horrible kludge to establish credentials for NFS XXX.
*/
- context.vc_proc = p;
+ context.vc_thread = current_thread();
context.vc_ucred = cred;
tmpbuf = _MALLOC(DEV_BSIZE, M_TEMP, M_WAITOK);
error = file_io(vp, &context, UIO_READ, tmpbuf, 0, DEV_BSIZE, NULL);
}
void
-vnclear(struct vn_softc *vn, struct proc * p)
+vnclear(struct vn_softc *vn, vfs_context_t ctx)
{
if (vn->sc_vp != NULL) {
/* release long-term reference */
- (void)vn_close(vn->sc_vp, vn->sc_open_flags, vn->sc_cred, p);
+ (void)vn_close(vn->sc_vp, vn->sc_open_flags, ctx);
vn->sc_vp = NULL;
}
if (vn->sc_shadow_vp != NULL) {
/* release long-term reference */
- (void)vn_close(vn->sc_shadow_vp, FREAD | FWRITE,
- vn->sc_cred, p);
+ (void)vn_close(vn->sc_shadow_vp, FREAD | FWRITE, ctx);
vn->sc_shadow_vp = NULL;
}
if (vn->sc_shadow_map != NULL) {
}
vn->sc_flags &= ~(VNF_INITED | VNF_READONLY);
if (vn->sc_cred) {
- kauth_cred_rele(vn->sc_cred);
- vn->sc_cred = NULL;
+ kauth_cred_unref(&vn->sc_cred);
}
vn->sc_size = 0;
vn->sc_fsize = 0;
void
vndevice_init(void)
{
- int i;
-
if (vndevice_inited)
return;
+
+ vndevice_do_init();
+}
+
+static void
+vndevice_do_init( void )
+{
+ int i;
+
vndevice_bdev_major = bdevsw_add(BDEV_MAJOR, &vn_bdevsw);
if (vndevice_bdev_major < 0) {
}
static void
-vn_ioctl_to_64(struct vn_ioctl *from, struct user_vn_ioctl *to)
+vn_ioctl_to_64(struct vn_ioctl_32 *from, struct vn_ioctl_64 *to)
{
to->vn_file = CAST_USER_ADDR_T(from->vn_file);
to->vn_size = from->vn_size;
projects / apple / xnu.git / blobdiff