From patchwork Sat Apr 15 15:37:36 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liping Zhang X-Patchwork-Id: 751057 X-Patchwork-Delegate: pablo@netfilter.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3w4zFh3TLbz9s7k for ; Sun, 16 Apr 2017 01:38:32 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=163.com header.i=@163.com header.b="fdok0cWO"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754169AbdDOPib (ORCPT ); Sat, 15 Apr 2017 11:38:31 -0400 Received: from m12-13.163.com ([220.181.12.13]:55686 "EHLO m12-13.163.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753705AbdDOPia (ORCPT ); Sat, 15 Apr 2017 11:38:30 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-Id; bh=UwHdKZInz1m5vhk4Rc W2slU7tde1kYW2/JrMH5BsAwI=; b=fdok0cWOIa7+TQWTFwYoTqUnS0BUTFxSC0 LrJgawmhqMgYso01FN86UjRfy1tuIRpqEa4H3Rvt2y2d5JJOjEM/90oNO6S29Jno 3cSugQgn4uTjIE6BOCJyGswb7JWg/CdWHS4H8gp+vJw2zJ5qFT4btk87RAlAPO9Y GOzXC90ns= Received: from MiWiFi-R2D-srv.localdomain (unknown [180.164.231.180]) by smtp9 (Coremail) with SMTP id DcCowAC33PBRPvJYV3f0MQ--.6930S2; Sat, 15 Apr 2017 23:38:08 +0800 (CST) From: Liping Zhang To: pablo@netfilter.org Cc: netfilter-devel@vger.kernel.org, Liping Zhang Subject: [PATCH nf] netfilter: nft_set_bitmap: free dummy elements when destroy the set Date: Sat, 15 Apr 2017 23:37:36 +0800 Message-Id: <1492270656-1664-1-git-send-email-zlpnobody@163.com> X-Mailer: git-send-email 2.5.5 X-CM-TRANSID: DcCowAC33PBRPvJYV3f0MQ--.6930S2 X-Coremail-Antispam: 1Uf129KBjvJXoW7AFyxAFyxJw1UGryktw43KFg_yoW8CF4rpr 45Gwn0kr4Sgr15Wa1jkFWFyF10qF1vkasrWryfC34rCFyUGr4DJan3GFZruwn8XrWDAF13 Jrs8Kw4jgry5WaUanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07jzXdUUUUUU= X-Originating-IP: [180.164.231.180] X-CM-SenderInfo: x2os00perg5qqrwthudrp/1tbiVAC6l1UL-+uZPwAAsV Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org From: Liping Zhang We forget to free dummy elements when deleting the set. So when I was running nft-test.py, I saw many kmemleak warnings: kmemleak: 1344 new suspected memory leaks ... # cat /sys/kernel/debug/kmemleak unreferenced object 0xffff8800631345c8 (size 32): comm "nft", pid 9075, jiffies 4295743309 (age 1354.815s) hex dump (first 32 bytes): f8 63 13 63 00 88 ff ff 88 79 13 63 00 88 ff ff .c.c.....y.c.... 04 0c 00 00 00 00 00 00 00 00 00 00 08 03 00 00 ................ backtrace: [] kmemleak_alloc+0x4a/0xa0 [] __kmalloc+0x164/0x310 [] nft_set_elem_init+0x3d/0x1b0 [nf_tables] [] nft_add_set_elem+0x45a/0x8c0 [nf_tables] [] nf_tables_newsetelem+0x105/0x1d0 [nf_tables] [] nfnetlink_rcv+0x414/0x770 [nfnetlink] [] netlink_unicast+0x1f6/0x310 [] netlink_sendmsg+0x306/0x3b0 ... Fixes: e920dde516088 ("netfilter: nft_set_bitmap: keep a list of dummy elements") Signed-off-by: Liping Zhang --- net/netfilter/nft_set_bitmap.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/net/netfilter/nft_set_bitmap.c b/net/netfilter/nft_set_bitmap.c index 8ebbc29..b988162 100644 --- a/net/netfilter/nft_set_bitmap.c +++ b/net/netfilter/nft_set_bitmap.c @@ -257,6 +257,11 @@ static int nft_bitmap_init(const struct nft_set *set, static void nft_bitmap_destroy(const struct nft_set *set) { + struct nft_bitmap *priv = nft_set_priv(set); + struct nft_bitmap_elem *be, *n; + + list_for_each_entry_safe(be, n, &priv->list, head) + nft_set_elem_destroy(set, be, true); } static bool nft_bitmap_estimate(const struct nft_set_desc *desc, u32 features,