|
@@ -143,8 +143,8 @@ static bool frag_expire_skip_icmp(u32 user)
|
|
static void ip_expire(struct timer_list *t)
|
|
static void ip_expire(struct timer_list *t)
|
|
{
|
|
{
|
|
struct inet_frag_queue *frag = from_timer(frag, t, timer);
|
|
struct inet_frag_queue *frag = from_timer(frag, t, timer);
|
|
- struct sk_buff *clone, *head;
|
|
|
|
const struct iphdr *iph;
|
|
const struct iphdr *iph;
|
|
|
|
+ struct sk_buff *head;
|
|
struct net *net;
|
|
struct net *net;
|
|
struct ipq *qp;
|
|
struct ipq *qp;
|
|
int err;
|
|
int err;
|
|
@@ -187,16 +187,12 @@ static void ip_expire(struct timer_list *t)
|
|
(skb_rtable(head)->rt_type != RTN_LOCAL))
|
|
(skb_rtable(head)->rt_type != RTN_LOCAL))
|
|
goto out;
|
|
goto out;
|
|
|
|
|
|
- clone = skb_clone(head, GFP_ATOMIC);
|
|
|
|
|
|
+ skb_get(head);
|
|
|
|
+ spin_unlock(&qp->q.lock);
|
|
|
|
+ icmp_send(head, ICMP_TIME_EXCEEDED, ICMP_EXC_FRAGTIME, 0);
|
|
|
|
+ kfree_skb(head);
|
|
|
|
+ goto out_rcu_unlock;
|
|
|
|
|
|
- /* Send an ICMP "Fragment Reassembly Timeout" message. */
|
|
|
|
- if (clone) {
|
|
|
|
- spin_unlock(&qp->q.lock);
|
|
|
|
- icmp_send(clone, ICMP_TIME_EXCEEDED,
|
|
|
|
- ICMP_EXC_FRAGTIME, 0);
|
|
|
|
- consume_skb(clone);
|
|
|
|
- goto out_rcu_unlock;
|
|
|
|
- }
|
|
|
|
out:
|
|
out:
|
|
spin_unlock(&qp->q.lock);
|
|
spin_unlock(&qp->q.lock);
|
|
out_rcu_unlock:
|
|
out_rcu_unlock:
|