From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.3 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_SANE_1 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 99482C4338F for ; Mon, 9 Aug 2021 09:30:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 7F5FF60EE7 for ; Mon, 9 Aug 2021 09:30:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234480AbhHIJbL (ORCPT ); Mon, 9 Aug 2021 05:31:11 -0400 Received: from szxga02-in.huawei.com ([45.249.212.188]:13403 "EHLO szxga02-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234338AbhHIJbJ (ORCPT ); Mon, 9 Aug 2021 05:31:09 -0400 Received: from dggemv711-chm.china.huawei.com (unknown [172.30.72.53]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4GjrMK4MjHzcmHf; Mon, 9 Aug 2021 17:27:09 +0800 (CST) Received: from dggpeml500017.china.huawei.com (7.185.36.243) by dggemv711-chm.china.huawei.com (10.1.198.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2176.2; Mon, 9 Aug 2021 17:30:47 +0800 Received: from [10.174.178.174] (10.174.178.174) by dggpeml500017.china.huawei.com (7.185.36.243) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2176.2; Mon, 9 Aug 2021 17:30:46 +0800 Subject: Re: [PATCH net v2] net: bridge: fix memleak in br_add_if() To: Nikolay Aleksandrov , , , CC: , , References: <20210809090211.65677-1-yangyingliang@huawei.com> <8af55b8a-0844-3fb2-8dd4-f6818c2675db@nvidia.com> From: Yang Yingliang Message-ID: Date: Mon, 9 Aug 2021 17:30:46 +0800 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:68.0) Gecko/20100101 Thunderbird/68.7.0 MIME-Version: 1.0 In-Reply-To: <8af55b8a-0844-3fb2-8dd4-f6818c2675db@nvidia.com> Content-Type: text/plain; charset="utf-8"; format=flowed Content-Transfer-Encoding: 8bit Content-Language: en-US X-Originating-IP: [10.174.178.174] X-ClientProxiedBy: dggems702-chm.china.huawei.com (10.3.19.179) To dggpeml500017.china.huawei.com (7.185.36.243) X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org On 2021/8/9 17:09, Nikolay Aleksandrov wrote: > On 09/08/2021 12:02, Yang Yingliang wrote: >> I got a memleak report: >> >> BUG: memory leak >> unreferenced object 0x607ee521a658 (size 240): >> comm "syz-executor.0", pid 955, jiffies 4294780569 (age 16.449s) >> hex dump (first 32 bytes, cpu 1): >> 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ >> 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ >> backtrace: >> [<00000000d830ea5a>] br_multicast_add_port+0x1c2/0x300 net/bridge/br_multicast.c:1693 >> [<00000000274d9a71>] new_nbp net/bridge/br_if.c:435 [inline] >> [<00000000274d9a71>] br_add_if+0x670/0x1740 net/bridge/br_if.c:611 >> [<0000000012ce888e>] do_set_master net/core/rtnetlink.c:2513 [inline] >> [<0000000012ce888e>] do_set_master+0x1aa/0x210 net/core/rtnetlink.c:2487 >> [<0000000099d1cafc>] __rtnl_newlink+0x1095/0x13e0 net/core/rtnetlink.c:3457 >> [<00000000a01facc0>] rtnl_newlink+0x64/0xa0 net/core/rtnetlink.c:3488 >> [<00000000acc9186c>] rtnetlink_rcv_msg+0x369/0xa10 net/core/rtnetlink.c:5550 >> [<00000000d4aabb9c>] netlink_rcv_skb+0x134/0x3d0 net/netlink/af_netlink.c:2504 >> [<00000000bc2e12a3>] netlink_unicast_kernel net/netlink/af_netlink.c:1314 [inline] >> [<00000000bc2e12a3>] netlink_unicast+0x4a0/0x6a0 net/netlink/af_netlink.c:1340 >> [<00000000e4dc2d0e>] netlink_sendmsg+0x789/0xc70 net/netlink/af_netlink.c:1929 >> [<000000000d22c8b3>] sock_sendmsg_nosec net/socket.c:654 [inline] >> [<000000000d22c8b3>] sock_sendmsg+0x139/0x170 net/socket.c:674 >> [<00000000e281417a>] ____sys_sendmsg+0x658/0x7d0 net/socket.c:2350 >> [<00000000237aa2ab>] ___sys_sendmsg+0xf8/0x170 net/socket.c:2404 >> [<000000004f2dc381>] __sys_sendmsg+0xd3/0x190 net/socket.c:2433 >> [<0000000005feca6c>] do_syscall_64+0x37/0x90 arch/x86/entry/common.c:47 >> [<000000007304477d>] entry_SYSCALL_64_after_hwframe+0x44/0xae >> >> On error path of br_add_if(), p->mcast_stats allocated in >> new_nbp() need be freed, or it will be leaked. >> >> Fixes: 1080ab95e3c7 ("net: bridge: add support for IGMP/MLD stats and export them via netlink") >> Reported-by: Hulk Robot >> Signed-off-by: Yang Yingliang >> --- >> v2: >> move free_percpu(p->mcast_stats) in release_nbp() and >> fix the compile error when CONFIG_BRIDGE_IGMP_SNOOPING >> is disabled. >> --- >> net/bridge/br_if.c | 5 ++++- >> net/bridge/br_multicast.c | 1 - >> 2 files changed, 4 insertions(+), 2 deletions(-) >> > You can add a helper to free mcast stats and use it in the error path. > I'd like to keep the port dismantling code as it's currently done, moving > multicast stats freeing away from br_multicast_del_port is wrong. > > In fact I think you can directly use br_multicast_del_port() as it's a noop w.r.t the > other actions (stopping timers that were never started and walking empty lists). > You'll have to test it, of course. OK,  I will send a v3 after my testing. Thanks, Yang > > For this patch: > Nacked-by: Nikolay Aleksandrov > > Thanks, > Nik > > .