|
@@ -660,13 +660,10 @@ outrel:
|
|
if (user.object_name_len > NCP_OBJECT_NAME_MAX_LEN)
|
|
if (user.object_name_len > NCP_OBJECT_NAME_MAX_LEN)
|
|
return -ENOMEM;
|
|
return -ENOMEM;
|
|
if (user.object_name_len) {
|
|
if (user.object_name_len) {
|
|
- newname = kmalloc(user.object_name_len, GFP_USER);
|
|
|
|
- if (!newname)
|
|
|
|
- return -ENOMEM;
|
|
|
|
- if (copy_from_user(newname, user.object_name, user.object_name_len)) {
|
|
|
|
- kfree(newname);
|
|
|
|
- return -EFAULT;
|
|
|
|
- }
|
|
|
|
|
|
+ newname = memdup_user(user.object_name,
|
|
|
|
+ user.object_name_len);
|
|
|
|
+ if (IS_ERR(newname))
|
|
|
|
+ return PTR_ERR(newname);
|
|
} else {
|
|
} else {
|
|
newname = NULL;
|
|
newname = NULL;
|
|
}
|
|
}
|
|
@@ -760,13 +757,9 @@ outrel:
|
|
if (user.len > NCP_PRIVATE_DATA_MAX_LEN)
|
|
if (user.len > NCP_PRIVATE_DATA_MAX_LEN)
|
|
return -ENOMEM;
|
|
return -ENOMEM;
|
|
if (user.len) {
|
|
if (user.len) {
|
|
- new = kmalloc(user.len, GFP_USER);
|
|
|
|
- if (!new)
|
|
|
|
- return -ENOMEM;
|
|
|
|
- if (copy_from_user(new, user.data, user.len)) {
|
|
|
|
- kfree(new);
|
|
|
|
- return -EFAULT;
|
|
|
|
- }
|
|
|
|
|
|
+ new = memdup_user(user.data, user.len);
|
|
|
|
+ if (IS_ERR(new))
|
|
|
|
+ return PTR_ERR(new);
|
|
} else {
|
|
} else {
|
|
new = NULL;
|
|
new = NULL;
|
|
}
|
|
}
|