* [patch 2/3] xen/privcmd: return -EFAULT on error
@ 2012-09-08 9:57 Dan Carpenter
2012-09-09 19:49 ` Andres Lagar-Cavilla
0 siblings, 1 reply; 2+ messages in thread
From: Dan Carpenter @ 2012-09-08 9:57 UTC (permalink / raw)
To: Andres Lagar-Cavilla
Cc: kernel-janitors, Jeremy Fitzhardinge, xen-devel, virtualization,
Konrad Rzeszutek Wilk
__copy_to_user() returns the number of bytes remaining to be copied but
we want to return a negative error code here.
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
diff --git a/drivers/xen/privcmd.c b/drivers/xen/privcmd.c
index fdff8f9..0ce006a 100644
--- a/drivers/xen/privcmd.c
+++ b/drivers/xen/privcmd.c
@@ -393,8 +393,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. */
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: [patch 2/3] xen/privcmd: return -EFAULT on error
2012-09-08 9:57 [patch 2/3] xen/privcmd: return -EFAULT on error Dan Carpenter
@ 2012-09-09 19:49 ` Andres Lagar-Cavilla
0 siblings, 0 replies; 2+ messages in thread
From: Andres Lagar-Cavilla @ 2012-09-09 19:49 UTC (permalink / raw)
To: Dan Carpenter
Cc: Jeremy Fitzhardinge, xen-devel, Konrad Rzeszutek Wilk,
Andres Lagar-Cavilla, kernel-janitors, virtualization
On Sep 8, 2012, at 5:57 AM, Dan Carpenter wrote:
> __copy_to_user() returns the number of bytes remaining to be copied but
> we want to return a negative error code here.
>
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Acked-by: Andres Lagar-Cavilla <andres@lagarcavilla.org>
>
> diff --git a/drivers/xen/privcmd.c b/drivers/xen/privcmd.c
> index fdff8f9..0ce006a 100644
> --- a/drivers/xen/privcmd.c
> +++ b/drivers/xen/privcmd.c
> @@ -393,8 +393,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. */
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2012-09-09 19:49 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-09-08 9:57 [patch 2/3] xen/privcmd: return -EFAULT on error Dan Carpenter
2012-09-09 19:49 ` Andres Lagar-Cavilla
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox