lists.openwall.net   lists  /  announce  owl-users  owl-dev  john-users  john-dev  passwdqc-users  yescrypt  popa3d-users  /  oss-security  kernel-hardening  musl  sabotage  tlsify  passwords  /  crypt-dev  xvendor  /  Bugtraq  Full-Disclosure  linux-kernel  linux-netdev  linux-ext4  PHC 
Open Source and information security mailing list archives
 
Hash Suite: Windows password security audit tool. GUI, reports in PDF.
[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Date:	Fri, 18 Jul 2008 14:04:18 +0900
From:	Magnus Damm <magnus.damm@...il.com>
To:	linux-kernel@...r.kernel.org
Cc:	Magnus Damm <magnus.damm@...il.com>, hjk@...utronix.de,
	gregkh@...e.de, akpm@...ux-foundation.org
Subject: [PATCH 02/06] uio: Pass struct uio_mem to mmap functions

From: Magnus Damm <damm@...l.co.jp>

This patch makes the UIO code pass a struct uio_mem pointer to the
mmap functions. This change allows us to remove one uio_find_mem()
call and an error check.

The error check can be removed since the struct uio_mem pointer has
already been verified in uio_mmap().

Signed-off-by: Magnus Damm <damm@...l.co.jp>
---

 drivers/uio/uio.c |   15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

--- 0002/drivers/uio/uio.c
+++ work/drivers/uio/uio.c	2008-07-18 12:40:42.000000000 +0900
@@ -477,17 +477,10 @@ static struct vm_operations_struct uio_v
 	.fault = uio_vma_fault,
 };
 
-static int uio_mmap_physical(struct vm_area_struct *vma)
+static int uio_mmap_physical(struct vm_area_struct *vma, struct uio_mem *imem)
 {
-	struct uio_mem *imem = uio_find_mem(vma);
-
-	if (!imem)
-		return -EINVAL;
-
 	vma->vm_flags |= VM_IO | VM_RESERVED;
-
 	vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot);
-
 	return remap_pfn_range(vma,
 			       vma->vm_start,
 			       imem->addr >> PAGE_SHIFT,
@@ -495,7 +488,7 @@ static int uio_mmap_physical(struct vm_a
 			       vma->vm_page_prot);
 }
 
-static int uio_mmap_logical(struct vm_area_struct *vma)
+static int uio_mmap_logical(struct vm_area_struct *vma, struct uio_mem *imem)
 {
 	vma->vm_flags |= VM_RESERVED;
 	vma->vm_ops = &uio_vm_ops;
@@ -532,10 +525,10 @@ static int uio_mmap(struct file *filep, 
 
 	switch (imem->memtype) {
 		case UIO_MEM_PHYS:
-			return uio_mmap_physical(vma);
+			return uio_mmap_physical(vma, imem);
 		case UIO_MEM_LOGICAL:
 		case UIO_MEM_VIRTUAL:
-			return uio_mmap_logical(vma);
+			return uio_mmap_logical(vma, imem);
 		default:
 			return -EINVAL;
 	}
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Powered by blists - more mailing lists