Browse Source

[PATCH] hidp __user annotations

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Al Viro 18 years ago
parent
commit
55e747445b
2 changed files with 2 additions and 2 deletions
  1. 1 1
      net/bluetooth/hidp/hidp.h
  2. 1 1
      net/bluetooth/hidp/sock.c

+ 1 - 1
net/bluetooth/hidp/hidp.h

@@ -86,7 +86,7 @@ struct hidp_connadd_req {
 	int   intr_sock;	// Connteted interrupt socket
 	int   intr_sock;	// Connteted interrupt socket
 	__u16 parser;
 	__u16 parser;
 	__u16 rd_size;
 	__u16 rd_size;
-	__u8 *rd_data;
+	__u8 __user *rd_data;
 	__u8  country;
 	__u8  country;
 	__u8  subclass;
 	__u8  subclass;
 	__u16 vendor;
 	__u16 vendor;

+ 1 - 1
net/bluetooth/hidp/sock.c

@@ -189,7 +189,7 @@ static int hidp_sock_compat_ioctl(struct socket *sock, unsigned int cmd, unsigne
 
 
 		uca = compat_alloc_user_space(sizeof(*uca));
 		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;
 			return -EFAULT;
 
 
 		if (put_user(ca.ctrl_sock, &uca->ctrl_sock) ||
 		if (put_user(ca.ctrl_sock, &uca->ctrl_sock) ||