From patchwork Mon Dec 2 10:45:14 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ana Rey X-Patchwork-Id: 295877 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 08E132C009D for ; Mon, 2 Dec 2013 21:48:10 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753243Ab3LBKsI (ORCPT ); Mon, 2 Dec 2013 05:48:08 -0500 Received: from mail-wg0-f44.google.com ([74.125.82.44]:50443 "EHLO mail-wg0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753198Ab3LBKsH (ORCPT ); Mon, 2 Dec 2013 05:48:07 -0500 Received: by mail-wg0-f44.google.com with SMTP id a1so9868536wgh.23 for ; Mon, 02 Dec 2013 02:48:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=rGYzAwuw45ag0+wYiepJ9WesckOWlHyu/jgoDeYZrtM=; b=ObAJlZZjVjokteNM4D4kG56BqGCia1ZnPSg5n2Nq/uSMD5xgBiNUQhSDvhuOaT4ulf pzZT+iPDRno81W2+97ZVgmDeszc/yogHZr0AaS7SYI6S/h/TkXDsxWsKRuTudHfm6Icb XVJWGGBoc3D4T0RbxVu3uz188+IIl7iUBG3fEiKu3x6+JJnL6kOEStF6DfH6jgZrNFqx yJuaXmkxpZO/l4sq+umvjdU47BhE7eN9WIP9lE9QbkqknBzMWWDb1UqaXWJo60W671UM vLVwBReBjDFtS9OQw4BAZ4Km6Q8ZhgLU1gSp+9t3v5RJrvXYmpDrv0snnOxg4IqI6on3 qspQ== X-Received: by 10.194.193.4 with SMTP id hk4mr1252626wjc.71.1385981286043; Mon, 02 Dec 2013 02:48:06 -0800 (PST) Received: from localhost.localdomain (73.231.78.188.dynamic.jazztel.es. [188.78.231.73]) by mx.google.com with ESMTPSA id b7sm121733731wiz.8.2013.12.02.02.48.04 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 02 Dec 2013 02:48:05 -0800 (PST) From: Ana Rey To: netfilter-devel@vger.kernel.org Cc: Ana Rey Subject: [PATCH] iptables: nft: fix memory leaks in nft_fini Date: Mon, 2 Dec 2013 11:45:14 +0100 Message-Id: <1385981114-3131-1-git-send-email-anarey@gmail.com> X-Mailer: git-send-email 1.8.4.rc3 Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org Those errors are shown with valgrind tool: valgrind --leak-check=full xtables -A INPUT -i eth0 -p tcp --dport 80 ==12554== 40 bytes in 1 blocks are still reachable in loss record 1 of 10 ==12554== at 0x4C2935B: malloc (vg_replace_malloc.c:270) ==12554== by 0x574D755: mnl_nlmsg_batch_start (nlmsg.c:447) ==12554== by 0x416520: nft_action (nft.c:2281) ==12554== by 0x41355E: xtables_main (xtables-standalone.c:75) ==12554== by 0x5B87994: (below main) (libc-start.c:260) ==12554== 135,168 bytes in 1 blocks are still reachable in loss record 9 of 10 ==12554== at 0x4C2935B: malloc (vg_replace_malloc.c:270) ==12554== by 0x415A24: mnl_nft_batch_alloc (nft.c:102) ==12554== by 0x416520: nft_action (nft.c:2281) ==12554== by 0x41355E: xtables_main (xtables-standalone.c:75) ==12554== by 0x5B87994: (below main) (libc-start.c:260) These objects are allocated from nft_init but they were not released appropriately in the exit path. --- iptables/nft.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/iptables/nft.c b/iptables/nft.c index 0599beb..a015947 100644 --- a/iptables/nft.c +++ b/iptables/nft.c @@ -618,6 +618,8 @@ int nft_init(struct nft_handle *h, struct builtin_table *t) void nft_fini(struct nft_handle *h) { mnl_socket_close(h->nl); + free(mnl_nlmsg_batch_head(h->batch)); + mnl_nlmsg_batch_stop(h->batch); } int nft_table_add(struct nft_handle *h, const struct nft_table *t)