Commit b2c52b8c authored by Markus Elfring's avatar Markus Elfring Committed by Juergen Gross

xen/privcmd: Use memdup_array_user() in alloc_ioreq()

* The function “memdup_array_user” was added with the
  commit 313ebe47 ("string.h: add
  array-wrappers for (v)memdup_user()").
  Thus use it accordingly.

  This issue was detected by using the Coccinelle software.

* Delete a label which became unnecessary with this refactoring.
Signed-off-by: default avatarMarkus Elfring <elfring@users.sourceforge.net>
Reviewed-by: default avatarJuergen Gross <jgross@suse.com>
Link: https://lore.kernel.org/r/41e333f7-1f3a-41b6-a121-a3c0ae54e36f@web.deSigned-off-by: default avatarJuergen Gross <jgross@suse.com>
parent 3693bb44
...@@ -1223,18 +1223,13 @@ struct privcmd_kernel_ioreq *alloc_ioreq(struct privcmd_ioeventfd *ioeventfd) ...@@ -1223,18 +1223,13 @@ struct privcmd_kernel_ioreq *alloc_ioreq(struct privcmd_ioeventfd *ioeventfd)
kioreq->ioreq = (struct ioreq *)(page_to_virt(pages[0])); kioreq->ioreq = (struct ioreq *)(page_to_virt(pages[0]));
mmap_write_unlock(mm); mmap_write_unlock(mm);
size = sizeof(*ports) * kioreq->vcpus; ports = memdup_array_user(u64_to_user_ptr(ioeventfd->ports),
ports = kzalloc(size, GFP_KERNEL); kioreq->vcpus, sizeof(*ports));
if (!ports) { if (IS_ERR(ports)) {
ret = -ENOMEM; ret = PTR_ERR(ports);
goto error_kfree; goto error_kfree;
} }
if (copy_from_user(ports, u64_to_user_ptr(ioeventfd->ports), size)) {
ret = -EFAULT;
goto error_kfree_ports;
}
for (i = 0; i < kioreq->vcpus; i++) { for (i = 0; i < kioreq->vcpus; i++) {
kioreq->ports[i].vcpu = i; kioreq->ports[i].vcpu = i;
kioreq->ports[i].port = ports[i]; kioreq->ports[i].port = ports[i];
...@@ -1256,7 +1251,7 @@ struct privcmd_kernel_ioreq *alloc_ioreq(struct privcmd_ioeventfd *ioeventfd) ...@@ -1256,7 +1251,7 @@ struct privcmd_kernel_ioreq *alloc_ioreq(struct privcmd_ioeventfd *ioeventfd)
error_unbind: error_unbind:
while (--i >= 0) while (--i >= 0)
unbind_from_irqhandler(irq_from_evtchn(ports[i]), &kioreq->ports[i]); unbind_from_irqhandler(irq_from_evtchn(ports[i]), &kioreq->ports[i]);
error_kfree_ports:
kfree(ports); kfree(ports);
error_kfree: error_kfree:
kfree(kioreq); kfree(kioreq);
......
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