Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit adbe734b authored by Jens Axboe's avatar Jens Axboe
Browse files

Merge branch 'stable/for-jens-4.3' of... 

Merge branch 'stable/for-jens-4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen into for-linus

Konrad writes:

It has one fix that should go in and also be put in stable tree (I've
added the CC already).

It is a fix for a memory leak that can exposed via using UEFI
xen-blkfront driver.
parents bcee19f4 f929d42c

drivers/block/xen-blkback/xenbus.c

+20 −18
Original line number Diff line number Diff line
@@ -212,6 +212,9 @@ static int xen_blkif_map(struct xen_blkif *blkif, grant_ref_t *gref, 


static int xen_blkif_disconnect(struct xen_blkif *blkif)

{

	struct pending_req *req, *n;

	int i = 0, j;



	if (blkif->xenblkd) {

		kthread_stop(blkif->xenblkd);

		wake_up(&blkif->shutdown_wq);
@@ -238,13 +241,28 @@ static int xen_blkif_disconnect(struct xen_blkif *blkif) 
	/* Remove all persistent grants and the cache of ballooned pages. */

	xen_blkbk_free_caches(blkif);



	/* Check that there is no request in use */

	list_for_each_entry_safe(req, n, &blkif->pending_free, free_list) {

		list_del(&req->free_list);



		for (j = 0; j < MAX_INDIRECT_SEGMENTS; j++)

			kfree(req->segments[j]);



		for (j = 0; j < MAX_INDIRECT_PAGES; j++)

			kfree(req->indirect_pages[j]);



		kfree(req);

		i++;

	}



	WARN_ON(i != (XEN_BLKIF_REQS_PER_PAGE * blkif->nr_ring_pages));

	blkif->nr_ring_pages = 0;



	return 0;

}



static void xen_blkif_free(struct xen_blkif *blkif)

{

	struct pending_req *req, *n;

	int i = 0, j;



	xen_blkif_disconnect(blkif);

	xen_vbd_free(&blkif->vbd);
@@ -257,22 +275,6 @@ static void xen_blkif_free(struct xen_blkif *blkif) 
	BUG_ON(!list_empty(&blkif->free_pages));

	BUG_ON(!RB_EMPTY_ROOT(&blkif->persistent_gnts));



	/* Check that there is no request in use */

	list_for_each_entry_safe(req, n, &blkif->pending_free, free_list) {

		list_del(&req->free_list);



		for (j = 0; j < MAX_INDIRECT_SEGMENTS; j++)

			kfree(req->segments[j]);



		for (j = 0; j < MAX_INDIRECT_PAGES; j++)

			kfree(req->indirect_pages[j]);



		kfree(req);

		i++;

	}



	WARN_ON(i != (XEN_BLKIF_REQS_PER_PAGE * blkif->nr_ring_pages));



	kmem_cache_free(xen_blkif_cachep, blkif);

}