firmware: xilinx: fix debugfs write handler
- Userspace wants to write a string with `len` bytes, not counting the terminating NULL, so we should allocate `len+1` bytes. It looks like the current code relied on having a nullbyte directly behind `kern_buff`, which happens to work reliably as long as `len` isn't one of the kmalloc size classes. - strncpy_from_user() is completely wrong here; userspace is giving us a (not necessarily null-terminated) buffer and its length. strncpy_from_user() is for cases in which we don't know the length. - Don't let broken userspace allocate arbitrarily big kmalloc allocations. Just use memdup_user_nul(), which is designed precisely for things like this. Signed-off-by: Jann Horn <jannh@google.com> Acked-by: Jolly Shah <jolly.shah@xilinx.com> Signed-off-by: Michal Simek <michal.simek@xilinx.com>
This commit is contained in:
Родитель
9e98c678c2
Коммит
b9472f7d82
|
@ -163,21 +163,14 @@ static ssize_t zynqmp_pm_debugfs_api_write(struct file *file,
|
||||||
|
|
||||||
strcpy(debugfs_buf, "");
|
strcpy(debugfs_buf, "");
|
||||||
|
|
||||||
if (*off != 0 || len == 0)
|
if (*off != 0 || len <= 1 || len > PAGE_SIZE - 1)
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
|
|
||||||
kern_buff = kzalloc(len, GFP_KERNEL);
|
kern_buff = memdup_user_nul(ptr, len);
|
||||||
if (!kern_buff)
|
if (IS_ERR(kern_buff))
|
||||||
return -ENOMEM;
|
return PTR_ERR(kern_buff);
|
||||||
|
|
||||||
tmp_buff = kern_buff;
|
tmp_buff = kern_buff;
|
||||||
|
|
||||||
ret = strncpy_from_user(kern_buff, ptr, len);
|
|
||||||
if (ret < 0) {
|
|
||||||
ret = -EFAULT;
|
|
||||||
goto err;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Read the API name from a user request */
|
/* Read the API name from a user request */
|
||||||
pm_api_req = strsep(&kern_buff, " ");
|
pm_api_req = strsep(&kern_buff, " ");
|
||||||
|
|
||||||
|
|
Загрузка…
Ссылка в новой задаче