Skip to content

Commit

Permalink
xen: xenfs: privcmd: check put_user() return code
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Vasiliy Kulikov authored and Jeremy Fitzhardinge committed Oct 29, 2010
1 parent 9387377 commit 313e744
Showing 1 changed file with 2 additions and 6 deletions.
8 changes: 2 additions & 6 deletions drivers/xen/xenfs/privcmd.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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);
}
Expand Down

0 comments on commit 313e744

Please sign in to comment.