]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
[AF_UNIX]: Test against sk_max_ack_backlog properly.
authorDavid S. Miller <davem@sunset.davemloft.net>
Fri, 2 Mar 2007 20:49:23 +0000 (12:49 -0800)
committerDavid S. Miller <davem@sunset.davemloft.net>
Sat, 3 Mar 2007 04:37:34 +0000 (20:37 -0800)
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: David S. Miller <davem@davemloft.net>
net/unix/af_unix.c

index 606971645b33e0c43e5f8e097144570fa317a80f..51ca4383c388da3a72ce3804de583fbafaa0ae2b 100644 (file)
@@ -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;