diff options
| author | Al Viro <viro@ftp.linux.org.uk> | 2007-02-09 11:38:00 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-09 12:14:06 -0500 |
| commit | 55e747445beec8df1133bb8681c884500546775c (patch) | |
| tree | 3a6913e808887a19501d32663a941011a14f18ad /net | |
| parent | d76fdf754a4b61741d78c545489145919affea4d (diff) | |
[PATCH] hidp __user annotations
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'net')
| -rw-r--r-- | net/bluetooth/hidp/hidp.h | 2 | ||||
| -rw-r--r-- | net/bluetooth/hidp/sock.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/net/bluetooth/hidp/hidp.h b/net/bluetooth/hidp/hidp.h index c2775f587d2e..c8dfacd40a06 100644 --- a/net/bluetooth/hidp/hidp.h +++ b/net/bluetooth/hidp/hidp.h | |||
| @@ -86,7 +86,7 @@ struct hidp_connadd_req { | |||
| 86 | int intr_sock; // Connteted interrupt socket | 86 | int intr_sock; // Connteted interrupt socket |
| 87 | __u16 parser; | 87 | __u16 parser; |
| 88 | __u16 rd_size; | 88 | __u16 rd_size; |
| 89 | __u8 *rd_data; | 89 | __u8 __user *rd_data; |
| 90 | __u8 country; | 90 | __u8 country; |
| 91 | __u8 subclass; | 91 | __u8 subclass; |
| 92 | __u16 vendor; | 92 | __u16 vendor; |
diff --git a/net/bluetooth/hidp/sock.c b/net/bluetooth/hidp/sock.c index 407fba43c1b9..93cf9e586178 100644 --- a/net/bluetooth/hidp/sock.c +++ b/net/bluetooth/hidp/sock.c | |||
| @@ -189,7 +189,7 @@ static int hidp_sock_compat_ioctl(struct socket *sock, unsigned int cmd, unsigne | |||
| 189 | 189 | ||
| 190 | uca = compat_alloc_user_space(sizeof(*uca)); | 190 | uca = compat_alloc_user_space(sizeof(*uca)); |
| 191 | 191 | ||
| 192 | if (copy_from_user(&ca, (void *) arg, sizeof(ca))) | 192 | if (copy_from_user(&ca, (void __user *) arg, sizeof(ca))) |
| 193 | return -EFAULT; | 193 | return -EFAULT; |
| 194 | 194 | ||
| 195 | if (put_user(ca.ctrl_sock, &uca->ctrl_sock) || | 195 | if (put_user(ca.ctrl_sock, &uca->ctrl_sock) || |