Skip to content

Commit 0aea6d5

Browse files
committed
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()
2 parents 997c443 + ba8c423 commit 0aea6d5

File tree

1 file changed

+1
-3
lines changed

1 file changed

+1
-3
lines changed

drivers/xen/xenbus/xenbus_client.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -693,10 +693,8 @@ static int xenbus_map_ring_pv(struct xenbus_device *dev,
693693
bool leaked;
694694

695695
area = alloc_vm_area(XEN_PAGE_SIZE * nr_grefs, info->ptes);
696-
if (!area) {
697-
kfree(node);
696+
if (!area)
698697
return -ENOMEM;
699-
}
700698

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

0 commit comments

Comments
 (0)