diff options
author | Arnd Bergmann <arnd@arndb.de> | 2010-01-30 07:23:03 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-02-03 23:20:32 -0500 |
commit | 8a83a00b0735190384a348156837918271034144 (patch) | |
tree | f69d903405e2424c196d8648bb6cb18443359373 /drivers/net/macvlan.c | |
parent | 6884b348ed759184032306c9435a727741a72298 (diff) |
net: maintain namespace isolation between vlan and real device
In the vlan and macvlan drivers, the start_xmit function forwards
data to the dev_queue_xmit function for another device, which may
potentially belong to a different namespace.
To make sure that classification stays within a single namespace,
this resets the potentially critical fields.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/macvlan.c')
-rw-r--r-- | drivers/net/macvlan.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/macvlan.c b/drivers/net/macvlan.c index fa0dc514dbaf..d32e0bdfc5e9 100644 --- a/drivers/net/macvlan.c +++ b/drivers/net/macvlan.c | |||
@@ -269,7 +269,7 @@ static int macvlan_queue_xmit(struct sk_buff *skb, struct net_device *dev) | |||
269 | } | 269 | } |
270 | 270 | ||
271 | xmit_world: | 271 | xmit_world: |
272 | skb->dev = vlan->lowerdev; | 272 | skb_set_dev(skb, vlan->lowerdev); |
273 | return dev_queue_xmit(skb); | 273 | return dev_queue_xmit(skb); |
274 | } | 274 | } |
275 | 275 | ||