---

yaml --- r: 198801 b: refs/heads/master c: f67231f h: refs/heads/master i: 198799: f6cc217 v: v3
git-mirror · May 27, 2010 · df222fd · df222fd
1 parent 3d26274
commit df222fd
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 9 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 87575437d8173c7da48a4dee25399807c7bec9cb
+refs/heads/master: f67231f80126f4e08c79c7b2056989c5c89ad4c6
diff --git a/trunk/drivers/char/applicom.c b/trunk/drivers/char/applicom.c
@@ -703,14 +703,9 @@ static long ac_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
 	/* In general, the device is only openable by root anyway, so we're not
 	   particularly concerned that bogus ioctls can flood the console. */
 
-	adgl = kmalloc(sizeof(struct st_ram_io), GFP_KERNEL);
-	if (!adgl)
-		return -ENOMEM;
-
-	if (copy_from_user(adgl, argp, sizeof(struct st_ram_io))) {
-		kfree(adgl);
-		return -EFAULT;
-	}
+	adgl = memdup_user(argp, sizeof(struct st_ram_io));
+	if (IS_ERR(adgl))
+		return PTR_ERR(adgl);
 
 	lock_kernel();	
 	IndexCard = adgl->num_card-1;