git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6
[pandora-kernel.git]
/
drivers
/
message
/
i2o
/
i2o_config.c
diff --git
a/drivers/message/i2o/i2o_config.c
b/drivers/message/i2o/i2o_config.c
index
d33693c
..
c4b117f
100644
(file)
--- 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)
if (!dev)
return -ENXIO;
if (!dev)
return -ENXIO;
- ops = kmalloc(kcmd.oplen, GFP_KERNEL);
- if (!ops)
- return -ENOMEM;
-
- if (copy_from_user(ops, kcmd.opbuf, kcmd.oplen)) {
- kfree(ops);
- return -EFAULT;
- }
+ ops = memdup_user(kcmd.opbuf, kcmd.oplen);
+ if (IS_ERR(ops))
+ return PTR_ERR(ops);
/*
* It's possible to have a _very_ large table
/*
* It's possible to have a _very_ large table