2 files changed, 10 insertions, 6 deletions

diff --git a/net/core/datagram.c b/net/core/datagram.c
index 81987df536..d219435d08 100644
--- a/net/core/datagram.c
+++ b/net/core/datagram.c
@@ -213,6 +213,10 @@ int skb_copy_datagram_iovec(const struct sk_buff *skb, int offset,
 {
         int i, err, fraglen, end = 0;
         struct sk_buff *next = skb_shinfo(skb)->frag_list;
+
+        if (!len)
+                return 0;
+
 next_skb:
         fraglen = skb_headlen(skb);
         i = -1;
diff --git a/net/core/stream.c b/net/core/stream.c
index ac9edfdf87..15bfd03e80 100644
--- a/net/core/stream.c
+++ b/net/core/stream.c
@@ -52,8 +52,9 @@ int sk_stream_wait_connect(struct sock *sk, long *timeo_p)
 {
         struct task_struct *tsk = current;
         DEFINE_WAIT(wait);
+        int done;
 
-        while (1) {
+        do {
                 if (sk->sk_err)
                         return sock_error(sk);
                 if ((1 << sk->sk_state) & ~(TCPF_SYN_SENT | TCPF_SYN_RECV))
@@ -65,13 +66,12 @@ int sk_stream_wait_connect(struct sock *sk, long *timeo_p)
 
                 prepare_to_wait(sk->sk_sleep, &wait, TASK_INTERRUPTIBLE);
                 sk->sk_write_pending++;
-                if (sk_wait_event(sk, timeo_p,
-                                  !((1 << sk->sk_state) & 
-                                    ~(TCPF_ESTABLISHED | TCPF_CLOSE_WAIT))))
-                        break;
+                done = sk_wait_event(sk, timeo_p,
+                                     !((1 << sk->sk_state) & 
+                                       ~(TCPF_ESTABLISHED | TCPF_CLOSE_WAIT)));
                 finish_wait(sk->sk_sleep, &wait);
                 sk->sk_write_pending--;
-        }
+        } while (!done);
         return 0;
 }