---

yaml --- r: 74495 b: refs/heads/master c: 0a11225 h: refs/heads/master i: 74493: da5b82d 74491: 42f8e60 74487: 33c5b8d 74479: bb68305 74463: b56692d 74431: 6405045 74367: d85c5fd 74239: 137e827 v: v3
git-mirror · Nov 29, 2007 · a29ae25 · a29ae25
1 parent 4d1c671
commit a29ae25
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6ab3b487db77fa98a24560f11a5a8e744b98d877
+refs/heads/master: 0a11225887fe6cbccd882404dc36ddc50f47daf9
diff --git a/trunk/net/unix/af_unix.c b/trunk/net/unix/af_unix.c
@@ -1637,8 +1637,15 @@ static int unix_dgram_recvmsg(struct kiocb *iocb, struct socket *sock,
 	mutex_lock(&u->readlock);
 
 	skb = skb_recv_datagram(sk, flags, noblock, &err);
-	if (!skb)
+	if (!skb) {
+		unix_state_lock(sk);
+		/* Signal EOF on disconnected non-blocking SEQPACKET socket. */
+		if (sk->sk_type == SOCK_SEQPACKET && err == -EAGAIN &&
+		    (sk->sk_shutdown & RCV_SHUTDOWN))
+			err = 0;
+		unix_state_unlock(sk);
 		goto out_unlock;
+	}
 
 	wake_up_interruptible_sync(&u->peer_wait);