summaryrefslogtreecommitdiff
path: root/drivers/xen
diff options
context:
space:
mode:
authorVasiliy Kulikov <segooon@gmail.com>2010-10-28 15:39:02 +0400
committerJeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>2010-10-29 11:02:25 -0700
commit313e74412105c670ff8900ec8099a3a5df1fa83c (patch)
tree43736d2d3eae7f65fd8c200f0b8bdf9fe9e38d6d /drivers/xen
parent9387377eb79a44f453fd27c3d00a2e5da587e369 (diff)
xen: xenfs: privcmd: check put_user() return code
put_user() may fail. In this case propagate error code from privcmd_ioctl_mmap_batch(). Signed-off-by: Vasiliy Kulikov <segooon@gmail.com> Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
Diffstat (limited to 'drivers/xen')
-rw-r--r--drivers/xen/xenfs/privcmd.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/xen/xenfs/privcmd.c b/drivers/xen/xenfs/privcmd.c
index f80be7f6eb95..2eb04c842511 100644
--- a/drivers/xen/xenfs/privcmd.c
+++ b/drivers/xen/xenfs/privcmd.c
@@ -266,9 +266,7 @@ static int mmap_return_errors(void *data, void *state)
xen_pfn_t *mfnp = data;
struct mmap_batch_state *st = state;
- put_user(*mfnp, st->user++);
-
- return 0;
+ return put_user(*mfnp, st->user++);
}
static struct vm_operations_struct privcmd_vm_ops;
@@ -323,10 +321,8 @@ static long privcmd_ioctl_mmap_batch(void __user *udata)
up_write(&mm->mmap_sem);
if (state.err > 0) {
- ret = 0;
-
state.user = m.arr;
- traverse_pages(m.num, sizeof(xen_pfn_t),
+ ret = traverse_pages(m.num, sizeof(xen_pfn_t),
&pagelist,
mmap_return_errors, &state);
}