Commit 7dccf1f4 authored by Jarek Poplawski's avatar Jarek Poplawski Committed by David S. Miller

ax25: Fix NULL pointer dereference and lockup.

From: Jarek Poplawski <jarkao2@gmail.com>

There is only one function in AX25 calling skb_append(), and it really
looks suspicious: appends skb after previously enqueued one, but in
the meantime this previous skb could be removed from the queue.

This patch Fixes it the simple way, so this is not fully compatible with
the current method, but testing hasn't shown any problems.
Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 537d59af
...@@ -64,20 +64,15 @@ void ax25_frames_acked(ax25_cb *ax25, unsigned short nr) ...@@ -64,20 +64,15 @@ void ax25_frames_acked(ax25_cb *ax25, unsigned short nr)
void ax25_requeue_frames(ax25_cb *ax25) void ax25_requeue_frames(ax25_cb *ax25)
{ {
struct sk_buff *skb, *skb_prev = NULL; struct sk_buff *skb;
/* /*
* Requeue all the un-ack-ed frames on the output queue to be picked * Requeue all the un-ack-ed frames on the output queue to be picked
* up by ax25_kick called from the timer. This arrangement handles the * up by ax25_kick called from the timer. This arrangement handles the
* possibility of an empty output queue. * possibility of an empty output queue.
*/ */
while ((skb = skb_dequeue(&ax25->ack_queue)) != NULL) { while ((skb = skb_dequeue_tail(&ax25->ack_queue)) != NULL)
if (skb_prev == NULL) skb_queue_head(&ax25->write_queue, skb);
skb_queue_head(&ax25->write_queue, skb);
else
skb_append(skb_prev, skb, &ax25->write_queue);
skb_prev = skb;
}
} }
/* /*
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment