[PATCH v3] staging: vt6655: ioctl.c - missing __user annotation

[PATCH v3] staging: vt6655: ioctl.c - missing __user annotation

[Anil Belur]

- private_ioctl() internally calls copy_{to,from}_user() and does
  not use '__user' which gives out several sparse warnings
- these sparse warnings were fixed by adding __user annotation to
  the data member of struct tagSCmdRequest:

 drivers/staging/vt6655/ioctl.c:78:51: warning: incorrect type in argument 2 (different address spaces)
 drivers/staging/vt6655/ioctl.c:78:51:    expected void const [noderef] asn:1>*from
 drivers/staging/vt6655/ioctl.c:78:51:    got void *data

Signed-off-by: Anil Belur <askb23@gmail.com>
---
v2:
- replaced the 'void __user *' casts by adding '__user' annotation to the data member of struct
  tagSCmdRequest which is much cleaner approach as suggested by tklauser@distanz.ch
v1:
- added 'void __user *' casts to supress the warnings

 drivers/staging/vt6655/iocmd.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/staging/vt6655/iocmd.h b/drivers/staging/vt6655/iocmd.h
index e499f1b..dd12498 100644
--- a/drivers/staging/vt6655/iocmd.h
+++ b/drivers/staging/vt6655/iocmd.h
@@ -100,7 +100,7 @@ typedef enum tagWZONETYPE {
 #pragma pack(1)
 typedef struct tagSCmdRequest {
 	u8	    name[16];
-	void	*data;
+	void __user *data;
 	u16	    wResult;
 	u16     wCmdCode;
 } SCmdRequest, *PSCmdRequest;
-- 
1.9.1

Re: [PATCH v3] staging: vt6655: ioctl.c - missing __user annotation

[Dan Carpenter]

On Wed, Jul 30, 2014 at 06:29:57PM +0530, Anil Belur wrote:
> - private_ioctl() internally calls copy_{to,from}_user() and does
>   not use '__user' which gives out several sparse warnings
> - these sparse warnings were fixed by adding __user annotation to
>   the data member of struct tagSCmdRequest:
> 
>  drivers/staging/vt6655/ioctl.c:78:51: warning: incorrect type in argument 2 (different address spaces)
>  drivers/staging/vt6655/ioctl.c:78:51:    expected void const [noderef] asn:1>*from
>  drivers/staging/vt6655/ioctl.c:78:51:    got void *data
> 
> Signed-off-by: Anil Belur <askb23@gmail.com>

Looks very nice now.

regards,
dan carpenter

Re: [PATCH v3] staging: vt6655: ioctl.c - missing __user annotation

[Greg KH]

On Wed, Jul 30, 2014 at 06:29:57PM +0530, Anil Belur wrote:
> - private_ioctl() internally calls copy_{to,from}_user() and does
>   not use '__user' which gives out several sparse warnings
> - these sparse warnings were fixed by adding __user annotation to
>   the data member of struct tagSCmdRequest:
> 
>  drivers/staging/vt6655/ioctl.c:78:51: warning: incorrect type in argument 2 (different address spaces)
>  drivers/staging/vt6655/ioctl.c:78:51:    expected void const [noderef] asn:1>*from
>  drivers/staging/vt6655/ioctl.c:78:51:    got void *data
> 
> Signed-off-by: Anil Belur <askb23@gmail.com>
> ---
> v2:
> - replaced the 'void __user *' casts by adding '__user' annotation to the data member of struct
>   tagSCmdRequest which is much cleaner approach as suggested by tklauser@distanz.ch
> v1:
> - added 'void __user *' casts to supress the warnings
> 
>  drivers/staging/vt6655/iocmd.h | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/staging/vt6655/iocmd.h b/drivers/staging/vt6655/iocmd.h
> index e499f1b..dd12498 100644
> --- a/drivers/staging/vt6655/iocmd.h
> +++ b/drivers/staging/vt6655/iocmd.h
> @@ -100,7 +100,7 @@ typedef enum tagWZONETYPE {
>  #pragma pack(1)
>  typedef struct tagSCmdRequest {
>  	u8	    name[16];
> -	void	*data;
> +	void __user *data;
>  	u16	    wResult;
>  	u16     wCmdCode;
>  } SCmdRequest, *PSCmdRequest;

This patch doesn't apply against my tree at all, what did you make it
against?

Always work against linux-next, or the staging-next branch of my
staging.git tree on git.kernel.org.

thanks,

greg k-h

Re: [PATCH v3] staging: vt6655: ioctl.c - missing __user annotation

[Anil Shashikumar Belur]

On Thursday 31 July 2014 05:38 AM, Greg KH wrote:
>
> This patch doesn't apply against my tree at all, what did you make it
> against?
>
> Always work against linux-next, or the staging-next branch of my
> staging.git tree on git.kernel.org.
>
> thanks,
>
> greg k-h
Hi,

I am working on staging.git. After rebasing with staging-next, git log
shows someone has recently submitted this fix.

Thanks,
Anil