- Change the vm_mmap() function to accept an objtype_t parameter specifying

  the type of object represented by the handle argument.
- Allow vm_mmap() to map device memory via cdev objects in addition to
  vnodes and anonymous memory.  Note that mmaping a cdev directly does not
  currently perform any MAC checks like mapping a vnode does.
- Unbreak the DRM getbufs ioctl by having it call vm_mmap() directly on the
  cdev the ioctl is acting on rather than trying to find a suitable vnode
  to map from.

Reviewed by:	alc, arch@

2 files changed, 5 insertions, 5 deletions

diff --git a/sys/compat/linux/linux_misc.c b/sys/compat/linux/linux_misc.c
index 7bbeaff..85cd13b 100644
--- a/sys/compat/linux/linux_misc.c
+++ b/sys/compat/linux/linux_misc.c
@@ -333,7 +333,7 @@ linux_uselib(struct thread *td, struct linux_uselib_args *args)
 
 	/* Pull in executable header into kernel_map */
 	error = vm_mmap(kernel_map, (vm_offset_t *)&a_out, PAGE_SIZE,
-	    VM_PROT_READ, VM_PROT_READ, 0, (caddr_t)vp, 0);
+	    VM_PROT_READ, VM_PROT_READ, 0, OBJT_VNODE, vp, 0);
 	/*
 	 * Lock no longer needed
 	 */
@@ -422,7 +422,7 @@ linux_uselib(struct thread *td, struct linux_uselib_args *args)
 		/* map file into kernel_map */
 		error = vm_mmap(kernel_map, &buffer,
 		    round_page(a_out->a_text + a_out->a_data + file_offset),
-		    VM_PROT_READ, VM_PROT_READ, 0, (caddr_t)vp,
+		    VM_PROT_READ, VM_PROT_READ, 0, OBJT_VNODE, vp,
 		    trunc_page(file_offset));
 		if (error)
 			goto cleanup;
@@ -453,7 +453,7 @@ linux_uselib(struct thread *td, struct linux_uselib_args *args)
 		 */
 		error = vm_mmap(&td->td_proc->p_vmspace->vm_map, &vmaddr,
 		    a_out->a_text + a_out->a_data, VM_PROT_ALL, VM_PROT_ALL,
-		    MAP_PRIVATE | MAP_FIXED, (caddr_t)vp, file_offset);
+		    MAP_PRIVATE | MAP_FIXED, OBJT_VNODE, vp, file_offset);
 		if (error)
 			goto cleanup;
 	}
diff --git a/sys/compat/svr4/imgact_svr4.c b/sys/compat/svr4/imgact_svr4.c
index 39eeb99..4c71020 100644
--- a/sys/compat/svr4/imgact_svr4.c
+++ b/sys/compat/svr4/imgact_svr4.c
@@ -145,7 +145,7 @@ exec_svr4_imgact(imgp)
 	error = vm_mmap(kernel_map, &buffer,
 			round_page(a_out->a_text + a_out->a_data + file_offset),
 			VM_PROT_READ, VM_PROT_READ, 0,
-			(caddr_t) imgp->vp, trunc_page(file_offset));
+			OBJT_VNODE, imgp->vp, trunc_page(file_offset));
 	if (error)
 	    goto fail;
 
@@ -182,7 +182,7 @@ exec_svr4_imgact(imgp)
 	    		VM_PROT_READ | VM_PROT_EXECUTE,
 	    		VM_PROT_ALL,
 	    		MAP_PRIVATE | MAP_FIXED,
-	    		(caddr_t)imgp->vp, file_offset);
+			OBJT_VNODE, imgp->vp, file_offset);
 	if (error)
 	    goto fail;