From bb3d2c67a8c7a8af1986c24b509ea49b3c5292ec Mon Sep 17 00:00:00 2001 From: Ursula Braun Date: Thu, 7 Feb 2008 18:07:19 -0800 Subject: [PATCH] --- yaml --- r: 84853 b: refs/heads/master c: d44447229e35115675d166b51a52e512c281475c h: refs/heads/master i: 84851: 8d13ecd952f341ea57656aeaf807a2ffce06292e v: v3 --- [refs] | 2 +- trunk/net/iucv/af_iucv.c | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 1a3f6934d0de..b88d369e1117 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 435bc9dfc6927eed9465e297d7aca1217aa61956 +refs/heads/master: d44447229e35115675d166b51a52e512c281475c diff --git a/trunk/net/iucv/af_iucv.c b/trunk/net/iucv/af_iucv.c index 2255e3c082ed..b3f5f840d067 100644 --- a/trunk/net/iucv/af_iucv.c +++ b/trunk/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; @@ -1118,10 +1124,10 @@ static void iucv_callback_txdone(struct iucv_path *path, this = list_skb; list_skb = list_skb->next; } while (memcmp(&msg->tag, this->cb, 4) && list_skb); + __skb_unlink(this, list); spin_unlock_irqrestore(&list->lock, flags); - skb_unlink(this, &iucv_sk(sk)->send_skb_q); kfree_skb(this); }