[MACVLAN]: Fix memleak on device removal/crash on module removal

[MACVLAN]: Fix memleak on device removal/crash on module removal

[Patrick McHardy]

[-- Attachment #1: Type: text/plain, Size: 0 bytes --]



[-- Attachment #2: x --]
[-- Type: text/plain, Size: 1166 bytes --]

commit 2fe876e51d1f053b55d8d50c3733b136b6add016
Author: Patrick McHardy <kaber@trash.net>
Date:   Wed May 7 09:43:05 2008 +0200

    [MACVLAN]: Fix memleak on device removal/crash on module removal
    
    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>

diff --git a/drivers/net/macvlan.c b/drivers/net/macvlan.c
index 2056cfc..c36a03a 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 = {

Re: [MACVLAN]: Fix memleak on device removal/crash on module removal

[Ben Greear]

Patrick McHardy wrote:
> 
> ------------------------------------------------------------------------
> 
> commit 2fe876e51d1f053b55d8d50c3733b136b6add016
> Author: Patrick McHardy <kaber@trash.net>
> Date:   Wed May 7 09:43:05 2008 +0200
> 
>     [MACVLAN]: Fix memleak on device removal/crash on module removal

Thanks.  I just tested this on 2.6.23 and it seems to fix the crash.

Ben

-- 
Ben Greear <greearb@candelatech.com>
Candela Technologies Inc  http://www.candelatech.com

Re: [MACVLAN]: Fix memleak on device removal/crash on module removal

[David Miller]

From: Ben Greear <greearb@candelatech.com>
Date: Wed, 07 May 2008 15:03:19 -0700

> Patrick McHardy wrote:
> > 
> > ------------------------------------------------------------------------
> > 
> > commit 2fe876e51d1f053b55d8d50c3733b136b6add016
> > Author: Patrick McHardy <kaber@trash.net>
> > Date:   Wed May 7 09:43:05 2008 +0200
> > 
> >     [MACVLAN]: Fix memleak on device removal/crash on module removal
> 
> Thanks.  I just tested this on 2.6.23 and it seems to fix the crash.

Thanks for testing Ben.

Re: [MACVLAN]: Fix memleak on device removal/crash on module removal

[David Miller]

From: Ben Greear <greearb@candelatech.com>
Date: Wed, 07 May 2008 15:03:19 -0700

> Patrick McHardy wrote:
> > 
> > ------------------------------------------------------------------------
> > 
> > commit 2fe876e51d1f053b55d8d50c3733b136b6add016
> > Author: Patrick McHardy <kaber@trash.net>
> > Date:   Wed May 7 09:43:05 2008 +0200
> > 
> >     [MACVLAN]: Fix memleak on device removal/crash on module removal
> 
> Thanks.  I just tested this on 2.6.23 and it seems to fix the crash.

I've applied this to net-2.6, and will queue it up for net-2.6
as well.

Thanks again!

Re: [MACVLAN]: Fix memleak on device removal/crash on module removal

[Ben Greear]

David Miller wrote:
> From: Ben Greear <greearb@candelatech.com>
> Date: Wed, 07 May 2008 15:03:19 -0700
>
>   
>> Patrick McHardy wrote:
>>     
>>> ------------------------------------------------------------------------
>>>
>>> commit 2fe876e51d1f053b55d8d50c3733b136b6add016
>>> Author: Patrick McHardy <kaber@trash.net>
>>> Date:   Wed May 7 09:43:05 2008 +0200
>>>
>>>     [MACVLAN]: Fix memleak on device removal/crash on module removal
>>>       
>> Thanks.  I just tested this on 2.6.23 and it seems to fix the crash.
>>     
>
> I've applied this to net-2.6, and will queue it up for net-2.6
> as well.
>
> Thanks again!
>   

This might be worth adding to any/all 2.6.23+ stable series since it's a 
reliable kernel crash on module unload.

I'm not sure if anyone else is really using mac-vlans much yet though...

Thanks,
Ben

-- 
Ben Greear <greearb@candelatech.com> 
Candela Technologies Inc  http://www.candelatech.com

Re: [MACVLAN]: Fix memleak on device removal/crash on module removal

[Patrick McHardy]

Ben Greear wrote:
>>>>     [MACVLAN]: Fix memleak on device removal/crash on module removal
>>>>       
>>> Thanks.  I just tested this on 2.6.23 and it seems to fix the crash.
>>>     
>>
>> I've applied this to net-2.6, and will queue it up for net-2.6
>> as well.
>>
>> Thanks again!
>>   
> 
> This might be worth adding to any/all 2.6.23+ stable series since it's a 
> reliable kernel crash on module unload.

I don't think there is anyone maintaining the stable kernels
before stable-2.6.25 (for which I think Dave already queued
it up, above appears to be a typo).

> I'm not sure if anyone else is really using mac-vlans much yet though...

I know of a few users, but not too many I guess. The fix
is obvious though so it doesn't hurt for -stable in any
case.