summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorDan Carpenter <error27@gmail.com>2011-03-19 06:44:34 +0100
committerKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>2011-03-24 15:32:44 +0100
commit12f0258d5b44b3b5a9442ec461bbac1f7edab8c6 (patch)
tree9dbaf66cde561ec613e5bd838a7a52642c3b1ae4 /drivers
parentMerge branch 'stable/xen.pm.bug-fixes' of git://git.kernel.org/pub/scm/linux/... (diff)
downloadlinux-12f0258d5b44b3b5a9442ec461bbac1f7edab8c6.tar.xz
linux-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')
-rw-r--r--drivers/xen/gntdev.c2
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]);