Commit b91796e8 authored by Sudip Mukherjee's avatar Sudip Mukherjee Committed by Greg Kroah-Hartman

staging: i4l: icn: use memdup_user

Its better to use memdup_user which does the same thing which this
code has implemented. Also removed a related warning as we will be
warned if allocation fails.
Suggested-by: default avatarFengguang Wu <fengguang.wu@intel.com>
Signed-off-by: default avatarSudip Mukherjee <sudip.mukherjee@codethink.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 3b1d7533
...@@ -810,16 +810,10 @@ icn_loadboot(u_char __user *buffer, icn_card *card) ...@@ -810,16 +810,10 @@ icn_loadboot(u_char __user *buffer, icn_card *card)
#ifdef BOOT_DEBUG #ifdef BOOT_DEBUG
printk(KERN_DEBUG "icn_loadboot called, buffaddr=%08lx\n", (ulong) buffer); printk(KERN_DEBUG "icn_loadboot called, buffaddr=%08lx\n", (ulong) buffer);
#endif #endif
codebuf = kmalloc(ICN_CODE_STAGE1, GFP_KERNEL); codebuf = memdup_user(buffer, ICN_CODE_STAGE1);
if (!codebuf) { if (IS_ERR(codebuf))
printk(KERN_WARNING "icn: Could not allocate code buffer\n"); return PTR_ERR(codebuf);
ret = -ENOMEM;
goto out;
}
if (copy_from_user(codebuf, buffer, ICN_CODE_STAGE1)) {
ret = -EFAULT;
goto out_kfree;
}
if (!card->rvalid) { if (!card->rvalid) {
if (!request_region(card->port, ICN_PORTLEN, card->regname)) { if (!request_region(card->port, ICN_PORTLEN, card->regname)) {
printk(KERN_WARNING printk(KERN_WARNING
...@@ -902,7 +896,6 @@ icn_loadboot(u_char __user *buffer, icn_card *card) ...@@ -902,7 +896,6 @@ icn_loadboot(u_char __user *buffer, icn_card *card)
out_kfree: out_kfree:
kfree(codebuf); kfree(codebuf);
out:
return ret; return ret;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment