Commit b51bd23c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-linus-5.18-rc4-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip 

Pull xen fixes from Juergen Gross:
 "A simple cleanup patch and a refcount fix for Xen on Arm"

* tag 'for-linus-5.18-rc4-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
  arm/xen: Fix some refcount leaks
  xen: Convert kmap() to kmap_local_page()
parents 13bc32ba 533bec14

arch/arm/xen/enlighten.c

+7 −2
Original line number Diff line number Diff line
@@ -337,12 +337,15 @@ int __init arch_xen_unpopulated_init(struct resource **res) 


	if (!nr_reg) {

		pr_err("No extended regions are found\n");

		of_node_put(np);

		return -EINVAL;

	}



	regs = kcalloc(nr_reg, sizeof(*regs), GFP_KERNEL);

	if (!regs)

	if (!regs) {

		of_node_put(np);

		return -ENOMEM;

	}



	/*

	 * Create resource from extended regions provided by the hypervisor to be
@@ -403,8 +406,8 @@ int __init arch_xen_unpopulated_init(struct resource **res) 
	*res = &xen_resource;



err:

	of_node_put(np);

	kfree(regs);



	return rc;

}

#endif
@@ -424,8 +427,10 @@ static void __init xen_dt_guest_init(void) 


	if (of_address_to_resource(xen_node, GRANT_TABLE_INDEX, &res)) {

		pr_err("Xen grant table region is not found\n");

		of_node_put(xen_node);

		return;

	}

	of_node_put(xen_node);

	xen_grant_frames = res.start;

}

drivers/xen/gntalloc.c

+2 −2
Original line number Diff line number Diff line
@@ -178,9 +178,9 @@ static void __del_gref(struct gntalloc_gref *gref) 
	unsigned long addr;



	if (gref->notify.flags & UNMAP_NOTIFY_CLEAR_BYTE) {

		uint8_t *tmp = kmap(gref->page);

		uint8_t *tmp = kmap_local_page(gref->page);

		tmp[gref->notify.pgoff] = 0;

		kunmap(gref->page);

		kunmap_local(tmp);

	}

	if (gref->notify.flags & UNMAP_NOTIFY_SEND_EVENT) {

		notify_remote_via_evtchn(gref->notify.event);