* [PATCH] macvlan: fix panic if lowerdev in a bond
@ 2011-05-20 16:44 Eric Dumazet
2011-05-20 18:59 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: Eric Dumazet @ 2011-05-20 16:44 UTC (permalink / raw)
To: David Miller; +Cc: netdev, Patrick McHardy, Jiri Pirko
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>
CC: Patrick McHardy <kaber@trash.net>
CC: Jiri Pirko <jpirko@redhat.com>
---
This is a stable candidate (2.6.36+)
drivers/net/macvlan.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/macvlan.c b/drivers/net/macvlan.c
index d7c0bc62..1e12a27 100644
--- a/drivers/net/macvlan.c
+++ b/drivers/net/macvlan.c
@@ -584,8 +584,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;
}
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] macvlan: fix panic if lowerdev in a bond
2011-05-20 16:44 [PATCH] macvlan: fix panic if lowerdev in a bond Eric Dumazet
@ 2011-05-20 18:59 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2011-05-20 18:59 UTC (permalink / raw)
To: eric.dumazet; +Cc: netdev, kaber, jpirko
From: Eric Dumazet <eric.dumazet@gmail.com>
Date: Fri, 20 May 2011 18:44:49 +0200
> 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>
Applied and queued up for -stable, thanks.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-05-20 19:01 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-05-20 16:44 [PATCH] macvlan: fix panic if lowerdev in a bond Eric Dumazet
2011-05-20 18:59 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).