Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 198adcde authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "tcp/dccp: drop SYN packets if accept queue is full"

parents de0e194a 5fcd2793

include/net/inet_connection_sock.h

+0 −5
Original line number Diff line number Diff line
@@ -289,11 +289,6 @@ static inline int inet_csk_reqsk_queue_len(const struct sock *sk) 
	return reqsk_queue_len(&inet_csk(sk)->icsk_accept_queue);

}



static inline int inet_csk_reqsk_queue_young(const struct sock *sk)

{

	return reqsk_queue_len_young(&inet_csk(sk)->icsk_accept_queue);

}



static inline int inet_csk_reqsk_queue_is_full(const struct sock *sk)

{

	return inet_csk_reqsk_queue_len(sk) >= sk->sk_max_ack_backlog;

net/dccp/ipv4.c

+1 −7
Original line number Diff line number Diff line
@@ -594,13 +594,7 @@ int dccp_v4_conn_request(struct sock *sk, struct sk_buff *skb) 
	if (inet_csk_reqsk_queue_is_full(sk))

		goto drop;



	/*

	 * Accept backlog is full. If we have already queued enough

	 * of warm entries in syn queue, drop request. It is better than

	 * clogging syn queue with openreqs with exponentially increasing

	 * timeout.

	 */

	if (sk_acceptq_is_full(sk) && inet_csk_reqsk_queue_young(sk) > 1)

	if (sk_acceptq_is_full(sk))

		goto drop;



	req = inet_reqsk_alloc(&dccp_request_sock_ops, sk, true);

net/dccp/ipv6.c

+1 −1
Original line number Diff line number Diff line
@@ -328,7 +328,7 @@ static int dccp_v6_conn_request(struct sock *sk, struct sk_buff *skb) 
	if (inet_csk_reqsk_queue_is_full(sk))

		goto drop;



	if (sk_acceptq_is_full(sk) && inet_csk_reqsk_queue_young(sk) > 1)

	if (sk_acceptq_is_full(sk))

		goto drop;



	req = inet_reqsk_alloc(&dccp6_request_sock_ops, sk, true);

net/ipv4/tcp_input.c

+1 −7
Original line number Diff line number Diff line
@@ -6352,13 +6352,7 @@ int tcp_conn_request(struct request_sock_ops *rsk_ops, 
			goto drop;

	}





	/* Accept backlog is full. If we have already queued enough

	 * of warm entries in syn queue, drop request. It is better than

	 * clogging syn queue with openreqs with exponentially increasing

	 * timeout.

	 */

	if (sk_acceptq_is_full(sk) && inet_csk_reqsk_queue_young(sk) > 1) {

	if (sk_acceptq_is_full(sk)) {

		NET_INC_STATS(sock_net(sk), LINUX_MIB_LISTENOVERFLOWS);

		goto drop;

	}