1 files changed, 20 insertions, 7 deletions

diff --git a/net/iucv/af_iucv.c b/net/iucv/af_iucv.c
index 2255e3c082ed..fee22caf1bad 100644
--- a/net/iucv/af_iucv.c
+++ b/net/iucv/af_iucv.c
@@ -482,6 +482,10 @@ static int iucv_sock_connect(struct socket *sock, struct sockaddr *addr,
         /* Create path. */
         iucv->path = iucv_path_alloc(IUCV_QUEUELEN_DEFAULT,
                                      IPRMDATA, GFP_KERNEL);
+        if (!iucv->path) {
+                err = -ENOMEM;
+                goto done;
+        }
         err = iucv_path_connect(iucv->path, &af_iucv_handler,
                                 sa->siucv_user_id, NULL, user_data, sk);
         if (err) {
@@ -1094,6 +1098,8 @@ static void iucv_callback_rx(struct iucv_path *path, struct iucv_message *msg)
 
 save_message:
         save_msg = kzalloc(sizeof(struct sock_msg_q), GFP_ATOMIC | GFP_DMA);
+        if (!save_msg)
+                return;
         save_msg->path = path;
         save_msg->msg = *msg;
 
@@ -1106,24 +1112,31 @@ static void iucv_callback_txdone(struct iucv_path *path,
                                  struct iucv_message *msg)
 {
         struct sock *sk = path->private;
-        struct sk_buff *this;
+        struct sk_buff *this = NULL;
         struct sk_buff_head *list = &iucv_sk(sk)->send_skb_q;
         struct sk_buff *list_skb = list->next;
         unsigned long flags;
 
-        if (list_skb) {
+        if (!skb_queue_empty(list)) {
                 spin_lock_irqsave(&list->lock, flags);
 
-                do {
-                        this = list_skb;
+                while (list_skb != (struct sk_buff *)list) {
+                        if (!memcmp(&msg->tag, list_skb->cb, 4)) {
+                                this = list_skb;
+                                break;
+                        }
                         list_skb = list_skb->next;
-                } while (memcmp(&msg->tag, this->cb, 4) && list_skb);
+                }
+                if (this)
+                        __skb_unlink(this, list);
 
                 spin_unlock_irqrestore(&list->lock, flags);
 
-                skb_unlink(this, &iucv_sk(sk)->send_skb_q);
-                kfree_skb(this);
+                if (this)
+                        kfree_skb(this);
         }
+        if (!this)
+                printk(KERN_ERR "AF_IUCV msg tag %u not found\n", msg->tag);
 
         if (sk->sk_state == IUCV_CLOSING) {
                 if (skb_queue_empty(&iucv_sk(sk)->send_skb_q)) {