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

Commit 248f0672 authored by David S. Miller's avatar David S. Miller
Browse files

[AF_UNIX]: Test against sk_max_ack_backlog properly. 



This brings things inline with the sk_acceptq_is_full() bug
fix.  The limit test should be x >= sk_max_ack_backlog.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 8488df89

net/unix/af_unix.c

+3 −3
Original line number Diff line number Diff line
@@ -934,7 +934,7 @@ static long unix_wait_for_peer(struct sock *other, long timeo) 


	sched = !sock_flag(other, SOCK_DEAD) &&

		!(other->sk_shutdown & RCV_SHUTDOWN) &&

		(skb_queue_len(&other->sk_receive_queue) >

		(skb_queue_len(&other->sk_receive_queue) >=

		 other->sk_max_ack_backlog);



	unix_state_runlock(other);
@@ -1008,7 +1008,7 @@ restart: 
	if (other->sk_state != TCP_LISTEN)

		goto out_unlock;



	if (skb_queue_len(&other->sk_receive_queue) >

	if (skb_queue_len(&other->sk_receive_queue) >=

	    other->sk_max_ack_backlog) {

		err = -EAGAIN;

		if (!timeo)
@@ -1381,7 +1381,7 @@ restart: 
	}



	if (unix_peer(other) != sk &&

	    (skb_queue_len(&other->sk_receive_queue) >

	    (skb_queue_len(&other->sk_receive_queue) >=

	     other->sk_max_ack_backlog)) {

		if (!timeo) {

			err = -EAGAIN;