* [PATCH] tipc __user annotations
@ 2006-10-10 21:45 Al Viro
2006-10-10 21:50 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: Al Viro @ 2006-10-10 21:45 UTC (permalink / raw)
To: torvalds; +Cc: linux-kernel
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
---
net/tipc/socket.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/net/tipc/socket.c b/net/tipc/socket.c
index 32d7784..acfb852 100644
--- a/net/tipc/socket.c
+++ b/net/tipc/socket.c
@@ -941,7 +941,7 @@ static int recv_stream(struct kiocb *ioc
int sz_to_copy;
int sz_copied = 0;
int needed;
- char *crs = m->msg_iov->iov_base;
+ char __user *crs = m->msg_iov->iov_base;
unsigned char *buf_crs;
u32 err;
int res;
@@ -1496,7 +1496,7 @@ static int setsockopt(struct socket *soc
return -ENOPROTOOPT;
if (ol < sizeof(value))
return -EINVAL;
- if ((res = get_user(value, (u32 *)ov)))
+ if ((res = get_user(value, (u32 __user *)ov)))
return res;
if (down_interruptible(&tsock->sem))
@@ -1541,7 +1541,7 @@ static int setsockopt(struct socket *soc
*/
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);
int len;
--
1.4.2.GIT
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] tipc __user annotations
2006-10-10 21:45 [PATCH] tipc __user annotations Al Viro
@ 2006-10-10 21:50 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2006-10-10 21:50 UTC (permalink / raw)
To: viro; +Cc: torvalds, linux-kernel
From: Al Viro <viro@ftp.linux.org.uk>
Date: Tue, 10 Oct 2006 22:45:57 +0100
>
> Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2006-10-10 21:51 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2006-10-10 21:45 [PATCH] tipc __user annotations Al Viro
2006-10-10 21:50 ` David Miller
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.