From c0ae8eae253f6221eed24df170267290a3f9534e Mon Sep 17 00:00:00 2001 From: Dan Carpenter Date: Sat, 8 Sep 2012 12:57:35 +0300 Subject: [PATCH] --- yaml --- r: 329149 b: refs/heads/master c: 9d2be9287107695708e6aae5105a8a518a6cb4d0 h: refs/heads/master i: 329147: 99cdaf3fbcd419bd19ea07b621064627c19c9776 v: v3 --- [refs] | 2 +- trunk/drivers/xen/privcmd.c | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 9e01b8930cc2..445f6d9b2214 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1714df7f2cee6a741c3ed24231ec5db25b90633a +refs/heads/master: 9d2be9287107695708e6aae5105a8a518a6cb4d0 diff --git a/trunk/drivers/xen/privcmd.c b/trunk/drivers/xen/privcmd.c index 3b162c656205..ef6389580b8c 100644 --- a/trunk/drivers/xen/privcmd.c +++ b/trunk/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. */