Re: AF_UNIX hangs

From: kuznet@ms2.inr.ac.ru
Date: Thu Feb 01 2001 - 14:49:56 EST


Hello!

> Looking at net/core/datagram.c:wait_for_packet the code will return 0

Yep... Damn, specially split errno and ready values and forgot to use
this. 8) Sorry.

Alexey

--- ../vger3-010130/linux/net/core/datagram.c Thu Dec 28 22:44:08 2000
+++ linux/net/core/datagram.c Thu Feb 1 22:45:47 2001
@@ -73,19 +73,19 @@
         /* Socket errors? */
         error = sock_error(sk);
         if (error)
- goto out;
+ goto out_err;
 
         if (!skb_queue_empty(&sk->receive_queue))
                 goto ready;
 
         /* Socket shut down? */
         if (sk->shutdown & RCV_SHUTDOWN)
- goto out;
+ goto out_noerr;
 
         /* Sequenced packets can come disconnected. If so we report the problem */
         error = -ENOTCONN;
         if(connection_based(sk) && !(sk->state==TCP_ESTABLISHED || sk->state==TCP_LISTEN))
- goto out;
+ goto out_err;
 
         /* handle signals */
         if (signal_pending(current))
@@ -100,11 +100,16 @@
 
 interrupted:
         error = sock_intr_errno(*timeo_p);
+out_err:
+ *err = error;
 out:
         current->state = TASK_RUNNING;
         remove_wait_queue(sk->sleep, &wait);
- *err = error;
         return error;
+out_noerr:
+ *err = 0;
+ error = 1;
+ goto out;
 }
 
 /*
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
Please read the FAQ at http://www.tux.org/lkml/



This archive was generated by hypermail 2b29 : Wed Feb 07 2001 - 21:00:13 EST