Skip to content

Commit

Permalink
[AF_IUCV]: broken send_skb_q results in endless loop
Browse files Browse the repository at this point in the history
A race has been detected in iucv_callback_txdone().
skb_unlink has to be done inside the locked area.

In addition checkings for successful allocations are inserted.

Signed-off-by: Ursula Braun <braunu@de.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Ursula Braun authored and David S. Miller committed Feb 8, 2008
1 parent 435bc9d commit d444472
Showing 1 changed file with 7 additions and 1 deletion.
8 changes: 7 additions & 1 deletion net/iucv/af_iucv.c
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down Expand Up @@ -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;

Expand All @@ -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);
}

Expand Down

0 comments on commit d444472

Please sign in to comment.