Skip to content

Commit

Permalink
tipc: remove redundant checking for the number of iovecs in a send re…
Browse files Browse the repository at this point in the history
…quest

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>
  • Loading branch information
Ying Xue authored and Paul Gortmaker committed Feb 15, 2013
1 parent aba79f3 commit 97f8b87
Showing 1 changed file with 3 additions and 6 deletions.
9 changes: 3 additions & 6 deletions net/tipc/socket.c
Original file line number Diff line number Diff line change
Expand Up @@ -503,8 +503,7 @@ static int send_msg(struct kiocb *iocb, struct socket *sock,
if (unlikely((m->msg_namelen < sizeof(*dest)) ||
(dest->family != AF_TIPC)))
return -EINVAL;
if ((total_len > TIPC_MAX_USER_MSG_SIZE) ||
(m->msg_iovlen > (unsigned int)INT_MAX))
if (total_len > TIPC_MAX_USER_MSG_SIZE)
return -EMSGSIZE;

if (iocb)
Expand Down Expand Up @@ -612,8 +611,7 @@ static int send_packet(struct kiocb *iocb, struct socket *sock,
if (unlikely(dest))
return send_msg(iocb, sock, m, total_len);

if ((total_len > TIPC_MAX_USER_MSG_SIZE) ||
(m->msg_iovlen > (unsigned int)INT_MAX))
if (total_len > TIPC_MAX_USER_MSG_SIZE)
return -EMSGSIZE;

if (iocb)
Expand Down Expand Up @@ -698,8 +696,7 @@ static int send_stream(struct kiocb *iocb, struct socket *sock,
goto exit;
}

if ((total_len > (unsigned int)INT_MAX) ||
(m->msg_iovlen > (unsigned int)INT_MAX)) {
if (total_len > (unsigned int)INT_MAX) {
res = -EMSGSIZE;
goto exit;
}
Expand Down

0 comments on commit 97f8b87

Please sign in to comment.