diff options
author | Li Zefan <lizf@cn.fujitsu.com> | 2009-03-31 18:23:16 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-01 11:59:13 -0400 |
commit | 610a77e04a8d9fe8764dc484e2182fa251ce1cc2 (patch) | |
tree | ec55b9b3698321c3e85cd649fa927554027c75d0 | |
parent | e2f17d9459aeccf4e013e31cbd741d6b1858eec4 (diff) |
memdup_user(): introduce
I notice there are many places doing copy_from_user() which follows
kmalloc():
dst = kmalloc(len, GFP_KERNEL);
if (!dst)
return -ENOMEM;
if (copy_from_user(dst, src, len)) {
kfree(dst);
return -EFAULT
}
memdup_user() is a wrapper of the above code. With this new function, we
don't have to write 'len' twice, which can lead to typos/mistakes. It
also produces smaller code and kernel text.
A quick grep shows 250+ places where memdup_user() *may* be used. I'll
prepare a patchset to do this conversion.
Signed-off-by: Li Zefan <lizf@cn.fujitsu.com>
Cc: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
Cc: Americo Wang <xiyou.wangcong@gmail.com>
Cc: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r-- | include/linux/string.h | 1 | ||||
-rw-r--r-- | mm/util.c | 30 |
2 files changed, 31 insertions, 0 deletions
diff --git a/include/linux/string.h b/include/linux/string.h index d18fc198aa2f..8852739f36df 100644 --- a/include/linux/string.h +++ b/include/linux/string.h | |||
@@ -12,6 +12,7 @@ | |||
12 | #include <linux/stddef.h> /* for NULL */ | 12 | #include <linux/stddef.h> /* for NULL */ |
13 | 13 | ||
14 | extern char *strndup_user(const char __user *, long); | 14 | extern char *strndup_user(const char __user *, long); |
15 | extern void *memdup_user(const void __user *, size_t); | ||
15 | 16 | ||
16 | /* | 17 | /* |
17 | * Include machine specific inline routines | 18 | * Include machine specific inline routines |
@@ -70,6 +70,36 @@ void *kmemdup(const void *src, size_t len, gfp_t gfp) | |||
70 | EXPORT_SYMBOL(kmemdup); | 70 | EXPORT_SYMBOL(kmemdup); |
71 | 71 | ||
72 | /** | 72 | /** |
73 | * memdup_user - duplicate memory region from user space | ||
74 | * | ||
75 | * @src: source address in user space | ||
76 | * @len: number of bytes to copy | ||
77 | * | ||
78 | * Returns an ERR_PTR() on failure. | ||
79 | */ | ||
80 | void *memdup_user(const void __user *src, size_t len) | ||
81 | { | ||
82 | void *p; | ||
83 | |||
84 | /* | ||
85 | * Always use GFP_KERNEL, since copy_from_user() can sleep and | ||
86 | * cause pagefault, which makes it pointless to use GFP_NOFS | ||
87 | * or GFP_ATOMIC. | ||
88 | */ | ||
89 | p = kmalloc_track_caller(len, GFP_KERNEL); | ||
90 | if (!p) | ||
91 | return ERR_PTR(-ENOMEM); | ||
92 | |||
93 | if (copy_from_user(p, src, len)) { | ||
94 | kfree(p); | ||
95 | return ERR_PTR(-EFAULT); | ||
96 | } | ||
97 | |||
98 | return p; | ||
99 | } | ||
100 | EXPORT_SYMBOL(memdup_user); | ||
101 | |||
102 | /** | ||
73 | * __krealloc - like krealloc() but don't free @p. | 103 | * __krealloc - like krealloc() but don't free @p. |
74 | * @p: object to reallocate memory for. | 104 | * @p: object to reallocate memory for. |
75 | * @new_size: how many bytes of memory are required. | 105 | * @new_size: how many bytes of memory are required. |