lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

tipc: remove redundant checking for the number of iovecs in a send request

Browse Source 
As the number of iovecs in a send request is already limited within
UIO_MAXIOV(i.e. 1024) in __sys_sendmsg(), it's unnecessary to check it
again in TIPC stack.

Signed-off-by: Ying Xue <ying.xue@windriver.com>
Signed-off-by: Jon Maloy <jon.maloy@ericsson.com>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
This commit is contained in:
Ying Xue
2013-01-31 21:51:47 +01:00
committed by Paul Gortmaker
parent aba79f332f
commit 97f8b87e91
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
net/tipc/socket.c
View File

@@ -503,8 +503,7 @@ static int send_msg(struct kiocb *iocb, struct socket *sock,
if (unlikely((m->msg_namelen < sizeof(*dest)) || if (unlikely((m->msg_namelen < sizeof(*dest)) ||
(dest->family != AF_TIPC))) (dest->family != AF_TIPC)))
return -EINVAL; return -EINVAL;
if ((total_len > TIPC_MAX_USER_MSG_SIZE) || if (total_len > TIPC_MAX_USER_MSG_SIZE)
(m->msg_iovlen > (unsigned int)INT_MAX))
return -EMSGSIZE; return -EMSGSIZE;
if (iocb) if (iocb)
@@ -612,8 +611,7 @@ static int send_packet(struct kiocb *iocb, struct socket *sock,
if (unlikely(dest)) if (unlikely(dest))
return send_msg(iocb, sock, m, total_len); return send_msg(iocb, sock, m, total_len);
if ((total_len > TIPC_MAX_USER_MSG_SIZE) || if (total_len > TIPC_MAX_USER_MSG_SIZE)
(m->msg_iovlen > (unsigned int)INT_MAX))
return -EMSGSIZE; return -EMSGSIZE;
if (iocb) if (iocb)
@@ -698,8 +696,7 @@ static int send_stream(struct kiocb *iocb, struct socket *sock,
goto exit; goto exit;
} }
if ((total_len > (unsigned int)INT_MAX) || if (total_len > (unsigned int)INT_MAX) {
(m->msg_iovlen > (unsigned int)INT_MAX)) {
res = -EMSGSIZE; res = -EMSGSIZE;
goto exit; goto exit;
} }