aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/xen/xenfs/privcmd.c
diff options
context:
space:
mode:
authorVasiliy Kulikov <segooon@gmail.com>2010-10-28 07:39:02 -0400
committerJeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>2010-10-29 14:02:25 -0400
commit313e74412105c670ff8900ec8099a3a5df1fa83c (patch)
tree43736d2d3eae7f65fd8c200f0b8bdf9fe9e38d6d /drivers/xen/xenfs/privcmd.c
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/xenfs/privcmd.c')
-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 f80be7f6eb9..2eb04c84251 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)
266 xen_pfn_t *mfnp = data; 266 xen_pfn_t *mfnp = data;
267 struct mmap_batch_state *st = state; 267 struct mmap_batch_state *st = state;
268 268
269 put_user(*mfnp, st->user++); 269 return put_user(*mfnp, st->user++);
270
271 return 0;
272} 270}
273 271
274static struct vm_operations_struct privcmd_vm_ops; 272static struct vm_operations_struct privcmd_vm_ops;
@@ -323,10 +321,8 @@ static long privcmd_ioctl_mmap_batch(void __user *udata)
323 up_write(&mm->mmap_sem); 321 up_write(&mm->mmap_sem);
324 322
325 if (state.err > 0) { 323 if (state.err > 0) {
326 ret = 0;
327
328 state.user = m.arr; 324 state.user = m.arr;
329 traverse_pages(m.num, sizeof(xen_pfn_t), 325 ret = traverse_pages(m.num, sizeof(xen_pfn_t),
330 &pagelist, 326 &pagelist,
331 mmap_return_errors, &state); 327 mmap_return_errors, &state);
332 } 328 }