---

yaml --- r: 202579 b: refs/heads/master c: b23d00e h: refs/heads/master i: 202577: ca2d6a0 202575: a5fc299 v: v3
git-mirror · May 31, 2010 · 14d00a0 · 14d00a0
1 parent 88276e4
commit 14d00a0
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: 16dff91804777efbb0ce18b0a7e54c55e86b7beb
+refs/heads/master: b23d00e9212d04eb894dd29422c7a53b36b8e32d
diff --git a/trunk/drivers/net/ppp_generic.c b/trunk/drivers/net/ppp_generic.c
@@ -538,14 +538,9 @@ static int get_filter(void __user *arg, struct sock_filter **p)
 	}
 
 	len = uprog.len * sizeof(struct sock_filter);
-	code = kmalloc(len, GFP_KERNEL);
-	if (code == NULL)
-		return -ENOMEM;
-
-	if (copy_from_user(code, uprog.filter, len)) {
-		kfree(code);
-		return -EFAULT;
-	}
+	code = memdup_user(uprog.filter, len);
+	if (IS_ERR(code))
+		return PTR_ERR(code);
 
 	err = sk_chk_filter(code, uprog.len);
 	if (err) {