Re: [PATCH 4.9.y] Revert "net: sit: fix memory leak in sit_init_net()"

From: maowenan
Date: Thu Oct 17 2019 - 21:48:30 EST




On 2019/10/17 2:30, Greg KH wrote:
> On Wed, Oct 16, 2019 at 02:33:54PM +0530, Ajay Kaher wrote:
>> This reverts commit 375d6d454a95ebacb9c6eb0b715da05a4458ffef which is
>> commit 07f12b26e21ab359261bf75cfcb424fdc7daeb6d upstream.
>>
>> Unnecessarily calling free_netdev() from sit_init_net().
>> ipip6_dev_free() of 4.9.y called free_netdev(), so no need
>> to call again after ipip6_dev_free().
>>
>> Cc: Mao Wenan <maowenan@xxxxxxxxxx>
>> Cc: David S. Miller <davem@xxxxxxxxxxxxx>
>> Cc: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
>> Signed-off-by: Ajay Kaher <akaher@xxxxxxxxxx>
>> ---
>> net/ipv6/sit.c | 1 -
>> 1 file changed, 1 deletion(-)
>>
>> diff --git a/net/ipv6/sit.c b/net/ipv6/sit.c
>> index 47ca2a2..16eba7b 100644
>> --- a/net/ipv6/sit.c
>> +++ b/net/ipv6/sit.c
>> @@ -1856,7 +1856,6 @@ static int __net_init sit_init_net(struct net *net)
>>
>> err_reg_dev:
>> ipip6_dev_free(sitn->fb_tunnel_dev);
>> - free_netdev(sitn->fb_tunnel_dev);
>> err_alloc_dev:
>> return err;
>> }
>> --
>> 2.7.4
>>
>
> Mao, are you ok with this change?
>
> thanks,
>
> greg k-h
>

Greg, ipip6_dev_free has already called free_netdev in stable 4.9.

Reviewed-by: Mao Wenan <maowenan@xxxxxxxxxx>

> .
>