diff options
| author | Patrick McHardy <kaber@trash.net> | 2007-04-03 04:03:55 +0200 |
|---|---|---|
| committer | Adrian Bunk <bunk@stusta.de> | 2007-04-03 04:03:55 +0200 |
| commit | 5f4a9d1b7a413d6aac382c51692ac0df785068c5 (patch) | |
| tree | 51067f1b0f341dcebc79e5c17e88d45189e613ee /net | |
| parent | cceec5186fce242e095dc5e9496841df5d4133b9 (diff) | |
[IFB]: Fix crash on input device removal
The input_device pointer is not refcounted, which means the device may
disappear while packets are queued, causing a crash when ifb passes packets
with a stale skb->dev pointer to netif_rx().
Fix by storing the interface index instead and do a lookup where neccessary.
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Diffstat (limited to 'net')
| -rw-r--r-- | net/core/dev.c | 8 | ||||
| -rw-r--r-- | net/core/skbuff.c | 2 | ||||
| -rw-r--r-- | net/sched/act_mirred.c | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/net/core/dev.c b/net/core/dev.c index 23cdd8b0575..57a4cebc045 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -1557,8 +1557,8 @@ static int ing_filter(struct sk_buff *skb) if (dev->qdisc_ingress) { __u32 ttl = (__u32) G_TC_RTTL(skb->tc_verd); if (MAX_RED_LOOP < ttl++) { - printk("Redir loop detected Dropping packet (%s->%s)\n", - skb->input_dev->name, skb->dev->name); + printk("Redir loop detected Dropping packet (%d->%d)\n", + skb->iif, skb->dev->ifindex); return TC_ACT_SHOT; } @@ -1591,8 +1591,8 @@ int netif_receive_skb(struct sk_buff *skb) if (!skb->tstamp.off_sec) net_timestamp(skb); - if (!skb->input_dev) - skb->input_dev = skb->dev; + if (!skb->iif) + skb->iif = skb->dev->ifindex; orig_dev = skb_bond(skb); diff --git a/net/core/skbuff.c b/net/core/skbuff.c index 890512eb66c..41b737637a7 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c @@ -443,7 +443,7 @@ struct sk_buff *skb_clone(struct sk_buff *skb, gfp_t gfp_mask) n->tc_verd = SET_TC_VERD(skb->tc_verd,0); n->tc_verd = CLR_TC_OK2MUNGE(n->tc_verd); n->tc_verd = CLR_TC_MUNGED(n->tc_verd); - C(input_dev); + C(iif); #endif #endif diff --git a/net/sched/act_mirred.c b/net/sched/act_mirred.c index 4fcccbd5088..6b2188b1814 100644 --- a/net/sched/act_mirred.c +++ b/net/sched/act_mirred.c @@ -207,7 +207,7 @@ bad_mirred: skb2->tc_verd = SET_TC_FROM(skb2->tc_verd, at); skb2->dev = dev; - skb2->input_dev = skb->dev; + skb2->iif = skb->dev->ifindex; dev_queue_xmit(skb2); spin_unlock(&p->lock); return p->action; |