Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 55e74744 authored by Al Viro's avatar Al Viro Committed by Linus Torvalds
Browse files

[PATCH] hidp __user annotations 



Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent d76fdf75

net/bluetooth/hidp/hidp.h

+1 −1
Original line number Diff line number Diff line
@@ -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;

net/bluetooth/hidp/sock.c

+1 −1
Original line number Diff line number Diff line
@@ -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) ||