提交 28c4dadd 编写于 作者: A Al Viro 提交者: Linus Torvalds

[PATCH] tipc __user annotations

Signed-off-by: NAl Viro <viro@zeniv.linux.org.uk>
Acked-by: NDavid S. Miller <davem@davemloft.net>
Signed-off-by: NLinus Torvalds <torvalds@osdl.org>
上级 47b16539
...@@ -941,7 +941,7 @@ static int recv_stream(struct kiocb *iocb, struct socket *sock, ...@@ -941,7 +941,7 @@ static int recv_stream(struct kiocb *iocb, struct socket *sock,
int sz_to_copy; int sz_to_copy;
int sz_copied = 0; int sz_copied = 0;
int needed; int needed;
char *crs = m->msg_iov->iov_base; char __user *crs = m->msg_iov->iov_base;
unsigned char *buf_crs; unsigned char *buf_crs;
u32 err; u32 err;
int res; int res;
...@@ -1496,7 +1496,7 @@ static int setsockopt(struct socket *sock, ...@@ -1496,7 +1496,7 @@ static int setsockopt(struct socket *sock,
return -ENOPROTOOPT; return -ENOPROTOOPT;
if (ol < sizeof(value)) if (ol < sizeof(value))
return -EINVAL; return -EINVAL;
if ((res = get_user(value, (u32 *)ov))) if ((res = get_user(value, (u32 __user *)ov)))
return res; return res;
if (down_interruptible(&tsock->sem)) if (down_interruptible(&tsock->sem))
...@@ -1541,7 +1541,7 @@ static int setsockopt(struct socket *sock, ...@@ -1541,7 +1541,7 @@ static int setsockopt(struct socket *sock,
*/ */
static int getsockopt(struct socket *sock, static int getsockopt(struct socket *sock,
int lvl, int opt, char __user *ov, int *ol) int lvl, int opt, char __user *ov, int __user *ol)
{ {
struct tipc_sock *tsock = tipc_sk(sock->sk); struct tipc_sock *tsock = tipc_sk(sock->sk);
int len; int len;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册