Skip to content

Commit

Permalink
udp: fix behavior of wrong checksums
Browse files Browse the repository at this point in the history
[ Upstream commit beb39db ]

We have two problems in UDP stack related to bogus checksums :

1) We return -EAGAIN to application even if receive queue is not empty.
   This breaks applications using edge trigger epoll()

2) Under UDP flood, we can loop forever without yielding to other
   processes, potentially hanging the host, especially on non SMP.

This patch is an attempt to make things better.

We might in the future add extra support for rt applications
wanting to better control time spent doing a recv() in a hostile
environment. For example we could validate checksums before queuing
packets in socket receive queue.

Signed-off-by: Eric Dumazet <edumazet@google.com>
Cc: Willem de Bruijn <willemb@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
  • Loading branch information
Eric Dumazet authored and sashalevin committed Apr 28, 2016
1 parent b3916de commit 94119c0
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 8 deletions.
6 changes: 2 additions & 4 deletions net/ipv4/udp.c
Original file line number Diff line number Diff line change
Expand Up @@ -1290,10 +1290,8 @@ int udp_recvmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
}
unlock_sock_fast(sk, slow);

if (noblock)
return -EAGAIN;

/* starting over for a new packet */
/* starting over for a new packet, but check if we need to yield */
cond_resched();
msg->msg_flags &= ~MSG_TRUNC;
goto try_again;
}
Expand Down
6 changes: 2 additions & 4 deletions net/ipv6/udp.c
Original file line number Diff line number Diff line change
Expand Up @@ -494,10 +494,8 @@ int udpv6_recvmsg(struct kiocb *iocb, struct sock *sk,
}
unlock_sock_fast(sk, slow);

if (noblock)
return -EAGAIN;

/* starting over for a new packet */
/* starting over for a new packet, but check if we need to yield */
cond_resched();
msg->msg_flags &= ~MSG_TRUNC;
goto try_again;
}
Expand Down

0 comments on commit 94119c0

Please sign in to comment.