]> git.karo-electronics.de Git - linux-beck.git/commitdiff
xen: xenfs: privcmd: check put_user() return code
authorVasiliy Kulikov <segooon@gmail.com>
Thu, 28 Oct 2010 11:39:02 +0000 (15:39 +0400)
committerJeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
Fri, 29 Oct 2010 18:02:25 +0000 (11:02 -0700)
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>
drivers/xen/xenfs/privcmd.c

index f80be7f6eb95265d223a40f2166bc29b6fb8d3c6..2eb04c842511e2506cc468bc34e5f8d0228a9222 100644 (file)
@@ -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);
        }