Commit 0aea6d5c authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'for-linus-5.8b-rc5-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip

Pull xen fix from Juergen Gross:
 "Just one fix of a recent patch (double free in an error path)"

* tag 'for-linus-5.8b-rc5-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
  xen/xenbus: Fix a double free in xenbus_map_ring_pv()
parents 997c4431 ba8c4234
...@@ -693,10 +693,8 @@ static int xenbus_map_ring_pv(struct xenbus_device *dev, ...@@ -693,10 +693,8 @@ static int xenbus_map_ring_pv(struct xenbus_device *dev,
bool leaked; bool leaked;
area = alloc_vm_area(XEN_PAGE_SIZE * nr_grefs, info->ptes); area = alloc_vm_area(XEN_PAGE_SIZE * nr_grefs, info->ptes);
if (!area) { if (!area)
kfree(node);
return -ENOMEM; return -ENOMEM;
}
for (i = 0; i < nr_grefs; i++) for (i = 0; i < nr_grefs; i++)
info->phys_addrs[i] = info->phys_addrs[i] =
......
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