mirror of
https://github.com/joel16/android_kernel_sony_msm8994.git
synced 2024-12-11 14:25:51 +00:00
mm: use memdup_user
Use memdup_user when user data is immediately copied into the allocated region. The semantic patch that makes this change is as follows: (http://coccinelle.lip6.fr/) // <smpl> @@ expression from,to,size,flag; position p; identifier l1,l2; @@ - to = \(kmalloc@p\|kzalloc@p\)(size,flag); + to = memdup_user(from,size); if ( - to==NULL + IS_ERR(to) || ...) { <+... when != goto l1; - -ENOMEM + PTR_ERR(to) ...+> } - if (copy_from_user(to, from, size) != 0) { - <+... when != goto l2; - -EFAULT - ...+> - } // </smpl> Signed-off-by: Julia Lawall <julia@diku.dk> Cc: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
9e58143dc0
commit
90d7404558
11
mm/util.c
11
mm/util.c
@ -225,15 +225,10 @@ char *strndup_user(const char __user *s, long n)
|
||||
if (length > n)
|
||||
return ERR_PTR(-EINVAL);
|
||||
|
||||
p = kmalloc(length, GFP_KERNEL);
|
||||
p = memdup_user(s, length);
|
||||
|
||||
if (!p)
|
||||
return ERR_PTR(-ENOMEM);
|
||||
|
||||
if (copy_from_user(p, s, length)) {
|
||||
kfree(p);
|
||||
return ERR_PTR(-EFAULT);
|
||||
}
|
||||
if (IS_ERR(p))
|
||||
return p;
|
||||
|
||||
p[length - 1] = '\0';
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user