2020-06-22 12:13:49

by Luc Van Oostenryck

Subject: [PATCH] openrisc: fix __user in raw_copy_to_user()'s prototype

raw_copy_to_user()'s prototype seems to be a copy & paste of
raw_copy_from_user() and as such has the __user annotation
in the 'from' argument instead of the 'to'.

So, move the __user annotation in the prototype to the 'to'.

Reported-by: kernel test robot <[email protected]>
Signed-off-by: Luc Van Oostenryck <[email protected]>
---
arch/openrisc/include/asm/uaccess.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/openrisc/include/asm/uaccess.h b/arch/openrisc/include/asm/uaccess.h
index 17c24f14615f..46e31bb4a9ad 100644
--- a/arch/openrisc/include/asm/uaccess.h
+++ b/arch/openrisc/include/asm/uaccess.h
@@ -241,7 +241,7 @@ raw_copy_from_user(void *to, const void __user *from, unsigned long size)
return __copy_tofrom_user(to, (__force const void *)from, size);
}
static inline unsigned long
-raw_copy_to_user(void *to, const void __user *from, unsigned long size)
+raw_copy_to_user(void __user *to, const void *from, unsigned long size)
{
return __copy_tofrom_user((__force void *)to, from, size);
}
--
2.27.0

2020-06-25 23:38:50

by Stafford Horne

Subject: Re: [PATCH] openrisc: fix __user in raw_copy_to_user()'s prototype

On Mon, Jun 22, 2020 at 02:11:24PM +0200, Luc Van Oostenryck wrote:
> raw_copy_to_user()'s prototype seems to be a copy & paste of
> raw_copy_from_user() and as such has the __user annotation
> in the 'from' argument instead of the 'to'.
>
> So, move the __user annotation in the prototype to the 'to'.

Thank you,

I have queued this for 5.9. If you think its more urgent let me know.

-Stafford

> Reported-by: kernel test robot <[email protected]>
> Signed-off-by: Luc Van Oostenryck <[email protected]>
> ---
> arch/openrisc/include/asm/uaccess.h | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/arch/openrisc/include/asm/uaccess.h b/arch/openrisc/include/asm/uaccess.h
> index 17c24f14615f..46e31bb4a9ad 100644
> --- a/arch/openrisc/include/asm/uaccess.h
> +++ b/arch/openrisc/include/asm/uaccess.h
> @@ -241,7 +241,7 @@ raw_copy_from_user(void *to, const void __user *from, unsigned long size)
> return __copy_tofrom_user(to, (__force const void *)from, size);
> }
> static inline unsigned long
> -raw_copy_to_user(void *to, const void __user *from, unsigned long size)
> +raw_copy_to_user(void __user *to, const void *from, unsigned long size)
> {
> return __copy_tofrom_user((__force void *)to, from, size);
> }