aboutsummaryrefslogtreecommitdiff
path: root/drivers/xen
diff options
context:
space:
mode:
authorDan Carpenter <dan.carpenter@oracle.com>2012-09-08 12:57:35 +0300
committerKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>2012-09-10 15:34:56 -0400
commit9d2be9287107695708e6aae5105a8a518a6cb4d0 (patch)
tree29a653d6354535842cae3c515211a5bf37da1f6b /drivers/xen
parent1714df7f2cee6a741c3ed24231ec5db25b90633a (diff)
downloadvexpress-lsk-9d2be9287107695708e6aae5105a8a518a6cb4d0.tar.gz
xen/privcmd: return -EFAULT on error
__copy_to_user() returns the number of bytes remaining to be copied but we want to return a negative error code here. Acked-by: Andres Lagar-Cavilla <andres@lagarcavilla.org> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Diffstat (limited to 'drivers/xen')
-rw-r--r--drivers/xen/privcmd.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/xen/privcmd.c b/drivers/xen/privcmd.c
index 3b162c65620..ef6389580b8 100644
--- a/drivers/xen/privcmd.c
+++ b/drivers/xen/privcmd.c
@@ -389,8 +389,11 @@ static long privcmd_ioctl_mmap_batch(void __user *udata, int version)
state.err = err_array;
ret = traverse_pages(m.num, sizeof(xen_pfn_t),
&pagelist, mmap_return_errors_v1, &state);
- } else if (version == 2)
+ } else if (version == 2) {
ret = __copy_to_user(m.err, err_array, m.num * sizeof(int));
+ if (ret)
+ ret = -EFAULT;
+ }
/* If we have not had any EFAULT-like global errors then set the global
* error to -ENOENT if necessary. */