diff options
| author | Eric Dumazet | 2011-05-20 20:59:23 +0200 |
|---|---|---|
| committer | David S. Miller | 2011-05-20 20:59:23 +0200 |
| commit | d93515611bbc70c2fe4db232e5feb448ed8e4cc9 (patch) | |
| tree | 7db1c770bd3a7ac1f27a5e9ccc231719ae3aa6c5 /drivers/net | |
| parent | tg3: Add braces around 5906 workaround. (diff) | |
| download | kernel-qcow2-linux-d93515611bbc70c2fe4db232e5feb448ed8e4cc9.tar.gz kernel-qcow2-linux-d93515611bbc70c2fe4db232e5feb448ed8e4cc9.tar.xz kernel-qcow2-linux-d93515611bbc70c2fe4db232e5feb448ed8e4cc9.zip | |
macvlan: fix panic if lowerdev in a bond
commit a35e2c1b6d905 (macvlan: use rx_handler_data pointer to store
macvlan_port pointer V2) added a bug in macvlan_port_create()
Steps to reproduce the bug:
# ifenslave bond0 eth0 eth1
# ip link add link eth0 up name eth0#1 type macvlan
->error EBUSY
# ip link add link eth0 up name eth0#1 type macvlan
->panic
Fix: Dont set IFF_MACVLAN_PORT in error case.
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/macvlan.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/macvlan.c b/drivers/net/macvlan.c index 07bcb8084d78..bbcf80afaf16 100644 --- a/drivers/net/macvlan.c +++ b/drivers/net/macvlan.c @@ -585,8 +585,8 @@ static int macvlan_port_create(struct net_device *dev) err = netdev_rx_handler_register(dev, macvlan_handle_frame, port); if (err) kfree(port); - - dev->priv_flags |= IFF_MACVLAN_PORT; + else + dev->priv_flags |= IFF_MACVLAN_PORT; return err; } |