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

Commit cf2acf66 authored by Ross Lagerwall's avatar Ross Lagerwall Committed by Boris Ostrovsky
Browse files

xen/gntdev: Fix partial gntdev_mmap() cleanup 



When cleaning up after a partially successful gntdev_mmap(), unmap the
successfully mapped grant pages otherwise Xen will kill the domain if
in debug mode (Attempt to implicitly unmap a granted PTE) or Linux will
kill the process and emit "BUG: Bad page map in process" if Xen is in
release mode.

This is only needed when use_ptemod is true because gntdev_put_map()
will unmap grant pages itself when use_ptemod is false.

Signed-off-by: default avatarRoss Lagerwall <ross.lagerwall@citrix.com>
Reviewed-by: default avatarBoris Ostrovsky <boris.ostrovsky@oracle.com>
Signed-off-by: default avatarBoris Ostrovsky <boris.ostrovsky@oracle.com>
parent 951a0102

drivers/xen/gntdev.c

+3 −1
Original line number Diff line number Diff line
@@ -1071,8 +1071,10 @@ static int gntdev_mmap(struct file *flip, struct vm_area_struct *vma) 
out_unlock_put:

	mutex_unlock(&priv->lock);

out_put_map:

	if (use_ptemod)

	if (use_ptemod) {

		map->vma = NULL;

		unmap_grant_pages(map, 0, map->count);

	}

	gntdev_put_map(priv, map);

	return err;

}