Merge branch 'stable/bug-fixes-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen

* 'stable/bug-fixes-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
  xen: Use new irq_move functions
  xen: Convert genirq namespace
  xen: fix p2m section mismatches
  xen/p2m: Allocate p2m tracking pages on override
  xen-gntdev: unlock on error path in gntdev_mmap()
  xen-gntdev: return -EFAULT on copy_to_user failure

1 files changed, 4 insertions, 2 deletions

diff --git a/drivers/xen/gntdev.c b/drivers/xen/gntdev.c
index 017ce600fbc6..b0f9e8fb0052 100644
--- a/drivers/xen/gntdev.c
+++ b/drivers/xen/gntdev.c
@@ -273,7 +273,7 @@ static int __unmap_grant_pages(struct grant_map *map, int offset, int pages)
                                 map->vma->vm_start + map->notify.addr;
                         err = copy_to_user(tmp, &err, 1);
                         if (err)
-                                return err;
+                                return -EFAULT;
                         map->notify.flags &= ~UNMAP_NOTIFY_CLEAR_BYTE;
                 } else if (pgno >= offset && pgno < offset + pages) {
                         uint8_t *tmp = kmap(map->pages[pgno]);
@@ -662,7 +662,7 @@ static int gntdev_mmap(struct file *flip, struct vm_area_struct *vma)
         if (map->flags) {
                 if ((vma->vm_flags & VM_WRITE) &&
                                 (map->flags & GNTMAP_readonly))
-                        return -EINVAL;
+                        goto out_unlock_put;
         } else {
                 map->flags = GNTMAP_host_map;
                 if (!(vma->vm_flags & VM_WRITE))
@@ -700,6 +700,8 @@ unlock_out:
         spin_unlock(&priv->lock);
         return err;
 
+out_unlock_put:
+        spin_unlock(&priv->lock);
 out_put_map:
         if (use_ptemod)
                 map->vma = NULL;