Commit 53f131c2 authored by Jan Beulich's avatar Jan Beulich Committed by Boris Ostrovsky
Browse files

xen-front-pgdir-shbuf: don't record wrong grant handle upon error 



In order for subsequent unmapping to not mistakenly unmap handle 0,
record a perceived always-invalid one instead.

Signed-off-by: default avatarJan Beulich <jbeulich@suse.com>
Reviewed-by: default avatarJuergen Gross <jgross@suse.com>
Reviewed-by: default avatarOleksandr Andrushchenko <oleksandr_andrushchenko@epam.com>
Link: https://lore.kernel.org/r/82414b0f-1b63-5509-7c1d-5bcc8239a3de@suse.com


Signed-off-by: default avatarBoris Ostrovsky <boris.ostrovsky@oracle.com>
parent 43135df0

drivers/xen/xen-front-pgdir-shbuf.c

+9 −2
Original line number Diff line number Diff line
@@ -305,12 +305,19 @@ static int backend_map(struct xen_front_pgdir_shbuf *buf) 


	/* Save handles even if error, so we can unmap. */

	for (cur_page = 0; cur_page < buf->num_pages; cur_page++) {

		buf->backend_map_handles[cur_page] = map_ops[cur_page].handle;

		if (unlikely(map_ops[cur_page].status != GNTST_okay))

		if (likely(map_ops[cur_page].status == GNTST_okay)) {

			buf->backend_map_handles[cur_page] =

				map_ops[cur_page].handle;

		} else {

			buf->backend_map_handles[cur_page] =

				INVALID_GRANT_HANDLE;

			if (!ret)

				ret = -ENXIO;

			dev_err(&buf->xb_dev->dev,

				"Failed to map page %d: %d\n",

				cur_page, map_ops[cur_page].status);

		}

	}



	if (ret) {

		dev_err(&buf->xb_dev->dev,