diff options
| author |   Dan Carpenter <error27@gmail.com> | 2011-03-19 08:44:34 +0300 |
|---|---|---|
| committer |   Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> | 2011-03-24 10:32:44 -0400 |
| commit | 12f0258d5b44b3b5a9442ec461bbac1f7edab8c6 (patch) | |
| tree | 9dbaf66cde561ec613e5bd838a7a52642c3b1ae4 /drivers/xen | |
| parent | Merge branch 'stable/xen.pm.bug-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen (diff) | |
| download | linux-dev-12f0258d5b44b3b5a9442ec461bbac1f7edab8c6.tar.xz linux-dev-12f0258d5b44b3b5a9442ec461bbac1f7edab8c6.zip | |
xen-gntdev: return -EFAULT on copy_to_user failure
copy_to_user() returns the amount of data remaining to be copied. We
want to return a negative error code here. The upper layers just
call WARN_ON() if we return non-zero so this doesn't change the
behavior. But returning -EFAULT is still cleaner.
Signed-off-by: Dan Carpenter <error27@gmail.com>
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Diffstat (limited to 'drivers/xen')
| -rw-r--r-- | drivers/xen/gntdev.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/xen/gntdev.c b/drivers/xen/gntdev.c index 017ce600fbc6..00b3accc43ee 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]); |