diff options
author | Julia Lawall <julia@diku.dk> | 2010-05-26 17:42:12 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-27 12:12:41 -0400 |
commit | b81d67a50c0f3021d170466388bec3e7fc3abe75 (patch) | |
tree | c9b974f52d7aef6e401f2ffe0b9b724c1b14e891 /drivers/message | |
parent | 9b71ca2005a93ad813b95d92578131ab899ccc5d (diff) |
drivers/message/i2o/i2o_config.c: 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>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/message')
-rw-r--r-- | drivers/message/i2o/i2o_config.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/drivers/message/i2o/i2o_config.c b/drivers/message/i2o/i2o_config.c index d33693c13368..c4b117f5fb70 100644 --- a/drivers/message/i2o/i2o_config.c +++ b/drivers/message/i2o/i2o_config.c | |||
@@ -186,14 +186,9 @@ static int i2o_cfg_parms(unsigned long arg, unsigned int type) | |||
186 | if (!dev) | 186 | if (!dev) |
187 | return -ENXIO; | 187 | return -ENXIO; |
188 | 188 | ||
189 | ops = kmalloc(kcmd.oplen, GFP_KERNEL); | 189 | ops = memdup_user(kcmd.opbuf, kcmd.oplen); |
190 | if (!ops) | 190 | if (IS_ERR(ops)) |
191 | return -ENOMEM; | 191 | return PTR_ERR(ops); |
192 | |||
193 | if (copy_from_user(ops, kcmd.opbuf, kcmd.oplen)) { | ||
194 | kfree(ops); | ||
195 | return -EFAULT; | ||
196 | } | ||
197 | 192 | ||
198 | /* | 193 | /* |
199 | * It's possible to have a _very_ large table | 194 | * It's possible to have a _very_ large table |