Commit d9351561 authored May 20, 2011 by Eric Dumazet Committed by David S. Miller May 20, 2011

macvlan: fix panic if lowerdev in a bond



commit a35e2c1b (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>

parent 7196cd6c

drivers/net/macvlan.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -585,7 +585,7 @@ static int macvlan_port_create(struct net_device *dev)
		err = netdev_rx_handler_register(dev, macvlan_handle_frame, port);
		if (err)
		kfree(port);

		else
		dev->priv_flags \|= IFF_MACVLAN_PORT;
		return err;
		}