diff options
author | Julia Lawall <julia@diku.dk> | 2010-05-22 10:21:27 +0200 |
---|---|---|
committer | Roland Dreier <rolandd@cisco.com> | 2010-05-25 21:10:57 -0700 |
commit | e642df6a0be93316c0a886766057c4cc510c123d (patch) | |
tree | 368e4ce5b02668228c9684efd918c59fb2e6e5ee | |
parent | ec96e2fe954c23a54bfdf2673437a39e193a1822 (diff) | |
download | talos-obmc-linux-e642df6a0be93316c0a886766057c4cc510c123d.tar.gz talos-obmc-linux-e642df6a0be93316c0a886766057c4cc510c123d.zip |
IB/ucm: 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>
-rw-r--r-- | drivers/infiniband/core/ucm.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/drivers/infiniband/core/ucm.c b/drivers/infiniband/core/ucm.c index 46474842cfe9..08f948df8fa9 100644 --- a/drivers/infiniband/core/ucm.c +++ b/drivers/infiniband/core/ucm.c @@ -706,14 +706,9 @@ static int ib_ucm_alloc_data(const void **dest, u64 src, u32 len) if (!len) return 0; - data = kmalloc(len, GFP_KERNEL); - if (!data) - return -ENOMEM; - - if (copy_from_user(data, (void __user *)(unsigned long)src, len)) { - kfree(data); - return -EFAULT; - } + data = memdup_user((void __user *)(unsigned long)src, len); + if (IS_ERR(data)) + return PTR_ERR(data); *dest = data; return 0; |