diff options
| author | Patrick McHardy <kaber@trash.net> | 2008-05-08 01:13:31 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2008-05-15 07:50:02 -0700 |
| commit | 781ce5ffe1ff6b5b288575d4d42f46cb7a25b175 (patch) | |
| tree | b1edd2f4087ba65b7d20707d83f46a218d8377d5 | |
| parent | 734bf48fe5276f319464fd30dc4a046a29d2b94a (diff) | |
macvlan: Fix memleak on device removal/crash on module removal
[ Upstream commit: 7312096454b6cd71267eaa3d0efb408e449e9ff3 ]
As noticed by Ben Greear, macvlan crashes the kernel when unloading the
module. The reason is that it tries to clean up the macvlan_port pointer
on the macvlan device itself instead of the underlying device. A non-NULL
pointer is taken as indication that the macvlan_handle_frame_hook is
valid, when receiving the next packet on the underlying device it tries
to call the NULL hook and crashes.
Clean up the macvlan_port on the correct device to fix this.
Signed-off-by; Patrick McHardy <kaber@trash.net>
Tested-by: Ben Greear <greearb@candelatech.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| -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 f651a816b28..34c2b9845c8 100644 --- a/drivers/net/macvlan.c +++ b/drivers/net/macvlan.c @@ -450,7 +450,7 @@ static void macvlan_dellink(struct net_device *dev) unregister_netdevice(dev); if (list_empty(&port->vlans)) - macvlan_port_destroy(dev); + macvlan_port_destroy(port->dev); } static struct rtnl_link_ops macvlan_link_ops __read_mostly = { |