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

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
Loading
Loading
Loading
Loading
+1 −3
Original line number Diff line number Diff line
@@ -693,10 +693,8 @@ static int xenbus_map_ring_pv(struct xenbus_device *dev,
	bool leaked;

	area = alloc_vm_area(XEN_PAGE_SIZE * nr_grefs, info->ptes);
	if (!area) {
		kfree(node);
	if (!area)
		return -ENOMEM;
	}

	for (i = 0; i < nr_grefs; i++)
		info->phys_addrs[i] =