Skip to content

Commit

Permalink
[PATCH] hidp __user annotations
Browse files Browse the repository at this point in the history 
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  • Loading branch information
Al Viro authored and Linus Torvalds committed Feb 9, 2007
1 parent d76fdf7 commit 55e7474
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion net/bluetooth/hidp/hidp.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ struct hidp_connadd_req {
int intr_sock; // Connteted interrupt socket
__u16 parser;
__u16 rd_size;
__u8 *rd_data;
__u8 __user *rd_data;
__u8 country;
__u8 subclass;
__u16 vendor;
Expand Down
2 changes: 1 addition & 1 deletion net/bluetooth/hidp/sock.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ static int hidp_sock_compat_ioctl(struct socket *sock, unsigned int cmd, unsigne

uca = compat_alloc_user_space(sizeof(*uca));

if (copy_from_user(&ca, (void *) arg, sizeof(ca)))
if (copy_from_user(&ca, (void __user *) arg, sizeof(ca)))
return -EFAULT;

if (put_user(ca.ctrl_sock, &uca->ctrl_sock) ||
Expand Down

0 comments on commit 55e7474

Please sign in to comment.