diff options
Diffstat (limited to 'net/tipc')
-rw-r--r-- | 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 32d778448a00..acfb852e7c98 100644 --- a/net/tipc/socket.c +++ b/net/tipc/socket.c | |||
@@ -941,7 +941,7 @@ static int recv_stream(struct kiocb *iocb, struct socket *sock, | |||
941 | int sz_to_copy; | 941 | int sz_to_copy; |
942 | int sz_copied = 0; | 942 | int sz_copied = 0; |
943 | int needed; | 943 | int needed; |
944 | char *crs = m->msg_iov->iov_base; | 944 | char __user *crs = m->msg_iov->iov_base; |
945 | unsigned char *buf_crs; | 945 | unsigned char *buf_crs; |
946 | u32 err; | 946 | u32 err; |
947 | int res; | 947 | int res; |
@@ -1496,7 +1496,7 @@ static int setsockopt(struct socket *sock, | |||
1496 | return -ENOPROTOOPT; | 1496 | return -ENOPROTOOPT; |
1497 | if (ol < sizeof(value)) | 1497 | if (ol < sizeof(value)) |
1498 | return -EINVAL; | 1498 | return -EINVAL; |
1499 | if ((res = get_user(value, (u32 *)ov))) | 1499 | if ((res = get_user(value, (u32 __user *)ov))) |
1500 | return res; | 1500 | return res; |
1501 | 1501 | ||
1502 | if (down_interruptible(&tsock->sem)) | 1502 | if (down_interruptible(&tsock->sem)) |
@@ -1541,7 +1541,7 @@ static int setsockopt(struct socket *sock, | |||
1541 | */ | 1541 | */ |
1542 | 1542 | ||
1543 | static int getsockopt(struct socket *sock, | 1543 | static int getsockopt(struct socket *sock, |
1544 | int lvl, int opt, char __user *ov, int *ol) | 1544 | int lvl, int opt, char __user *ov, int __user *ol) |
1545 | { | 1545 | { |
1546 | struct tipc_sock *tsock = tipc_sk(sock->sk); | 1546 | struct tipc_sock *tsock = tipc_sk(sock->sk); |
1547 | int len; | 1547 | int len; |