aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
Diffstat (limited to 'net')
-rw-r--r--net/tipc/socket.c12
1 files changed, 7 insertions, 5 deletions
diff --git a/net/tipc/socket.c b/net/tipc/socket.c
index eaf4d6951a4a..0923213fc6a4 100644
--- a/net/tipc/socket.c
+++ b/net/tipc/socket.c
@@ -437,7 +437,7 @@ static int dest_name_check(struct sockaddr_tipc *dest, struct msghdr *m)
437 * @iocb: (unused) 437 * @iocb: (unused)
438 * @sock: socket structure 438 * @sock: socket structure
439 * @m: message to send 439 * @m: message to send
440 * @total_len: (unused) 440 * @total_len: length of message
441 * 441 *
442 * Message must have an destination specified explicitly. 442 * Message must have an destination specified explicitly.
443 * Used for SOCK_RDM and SOCK_DGRAM messages, 443 * Used for SOCK_RDM and SOCK_DGRAM messages,
@@ -538,7 +538,7 @@ exit:
538 * @iocb: (unused) 538 * @iocb: (unused)
539 * @sock: socket structure 539 * @sock: socket structure
540 * @m: message to send 540 * @m: message to send
541 * @total_len: (unused) 541 * @total_len: length of message
542 * 542 *
543 * Used for SOCK_SEQPACKET messages and SOCK_STREAM data. 543 * Used for SOCK_SEQPACKET messages and SOCK_STREAM data.
544 * 544 *
@@ -1386,7 +1386,7 @@ exit:
1386/** 1386/**
1387 * shutdown - shutdown socket connection 1387 * shutdown - shutdown socket connection
1388 * @sock: socket structure 1388 * @sock: socket structure
1389 * @how: direction to close (always treated as read + write) 1389 * @how: direction to close (unused; always treated as read + write)
1390 * 1390 *
1391 * Terminates connection (if necessary), then purges socket's receive queue. 1391 * Terminates connection (if necessary), then purges socket's receive queue.
1392 * 1392 *
@@ -1469,7 +1469,8 @@ restart:
1469 * Returns 0 on success, errno otherwise 1469 * Returns 0 on success, errno otherwise
1470 */ 1470 */
1471 1471
1472static int setsockopt(struct socket *sock, int lvl, int opt, char *ov, int ol) 1472static int setsockopt(struct socket *sock,
1473 int lvl, int opt, char __user *ov, int ol)
1473{ 1474{
1474 struct tipc_sock *tsock = tipc_sk(sock->sk); 1475 struct tipc_sock *tsock = tipc_sk(sock->sk);
1475 u32 value; 1476 u32 value;
@@ -1525,7 +1526,8 @@ static int setsockopt(struct socket *sock, int lvl, int opt, char *ov, int ol)
1525 * Returns 0 on success, errno otherwise 1526 * Returns 0 on success, errno otherwise
1526 */ 1527 */
1527 1528
1528static int getsockopt(struct socket *sock, int lvl, int opt, char *ov, int *ol) 1529static int getsockopt(struct socket *sock,
1530 int lvl, int opt, char __user *ov, int *ol)
1529{ 1531{
1530 struct tipc_sock *tsock = tipc_sk(sock->sk); 1532 struct tipc_sock *tsock = tipc_sk(sock->sk);
1531 int len; 1533 int len;