diff options
| author | Patrick McHardy <kaber@trash.net> | 2008-01-11 07:39:28 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-01-11 07:39:28 +0100 |
| commit | a6ca5f1dbe40470fcb1ecc921769d792a1e77ed9 (patch) | |
| tree | c74e49b849ff9806aa4349587c3623cb90ddf0e6 | |
| parent | [VLAN]: nested VLAN: fix lockdep's recursive locking warning (diff) | |
| download | linux-a6ca5f1dbe40470fcb1ecc921769d792a1e77ed9.tar.xz linux-a6ca5f1dbe40470fcb1ecc921769d792a1e77ed9.zip | |
[MACVLAN]: Prevent nesting macvlan devices
Don't allow to nest macvlan devices since it will cause lockdep
warnings and isn't really useful for anything.
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/macvlan.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/net/macvlan.c b/drivers/net/macvlan.c index 2e4bcd5654c4..e8dc2f44fec9 100644 --- a/drivers/net/macvlan.c +++ b/drivers/net/macvlan.c @@ -384,6 +384,13 @@ static int macvlan_newlink(struct net_device *dev, if (lowerdev == NULL) return -ENODEV; + /* Don't allow macvlans on top of other macvlans - its not really + * wrong, but lockdep can't handle it and its not useful for anything + * you couldn't do directly on top of the real device. + */ + if (lowerdev->rtnl_link_ops == dev->rtnl_link_ops) + return -ENODEV; + if (!tb[IFLA_MTU]) dev->mtu = lowerdev->mtu; else if (dev->mtu > lowerdev->mtu) |