From patchwork Fri Jan 27 20:38:46 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Cernekee X-Patchwork-Id: 720911 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 3v99cb115kz9sQw for ; Sat, 28 Jan 2017 07:39:11 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751120AbdA0UjD (ORCPT ); Fri, 27 Jan 2017 15:39:03 -0500 Received: from mail-pg0-f51.google.com ([74.125.83.51]:36614 "EHLO mail-pg0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750783AbdA0Ui5 (ORCPT ); Fri, 27 Jan 2017 15:38:57 -0500 Received: by mail-pg0-f51.google.com with SMTP id 3so25192817pgj.3 for ; Fri, 27 Jan 2017 12:38:56 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=B9/ZMxpW5ynapPx4EgTx8x9U0M1rYLq2phUhBgMEPeg=; b=lXqmuOKmMmu1Rv/e37uXyBHIRFXF4g1k3Pej2IMsrDIsifQL9wagOqpNpxzBlfIyyj nZJJ8j4zyn17mSItzz/g4pwcne6OiguHh5yMResjaMEW9BioJmYzLmBZcBS7Lc5a6zbw xOzAi4TDCOWMoV+dadzjSL25kQm9DH49PQNdY7Qo7dDCfDKCvXMDZQi4Vee6eD3rWltP dxeXKOe5XZxnnUo8B87wt2t//eXm335XLlOyh0KamMfIC7k/q3Crgia6Ll/nmFyOfwSE K+YANz44jcsYZsfQjJQvzbMFU+Xcj34mtLmuC/UXRUYkA0x3CqhRxy0nlaH01v+gMtT7 6Fpw== X-Gm-Message-State: AIkVDXJhSjR6Eq8cozqfS7ee+P35ZoQLsFXixMBCf+yzr4Wf+XouLPnzVDy/or73my9mZlyj X-Received: by 10.98.36.16 with SMTP id r16mr11089428pfj.56.1485549536412; Fri, 27 Jan 2017 12:38:56 -0800 (PST) Received: from kcl.mtv.corp.google.com ([172.22.66.15]) by smtp.gmail.com with ESMTPSA id s17sm13438128pgo.27.2017.01.27.12.38.55 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 27 Jan 2017 12:38:55 -0800 (PST) From: Kevin Cernekee To: pablo@netfilter.org Cc: netfilter-devel@vger.kernel.org Subject: [PATCH 1/2 conntrack-tools] conntrackd: cthelper: Free pktb after use Date: Fri, 27 Jan 2017 12:38:46 -0800 Message-Id: <20170127203847.10785-1-cernekee@chromium.org> X-Mailer: git-send-email 2.11.0.483.g087da7b7c-goog Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org According to valgrind, this currently leaks ~512B to 2kB for each packet sent to the userspace helper. Signed-off-by: Kevin Cernekee --- src/cthelper.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/cthelper.c b/src/cthelper.c index 54eb830..f01c509 100644 --- a/src/cthelper.c +++ b/src/cthelper.c @@ -325,6 +325,7 @@ static int nfq_queue_cb(const struct nlmsghdr *nlh, void *data) if (pkt_verdict_issue(helper, myct, queue_num, id, verdict, pktb) < 0) goto err4; + pktb_free(pktb); nfct_destroy(ct); if (myct->exp != NULL) nfexp_destroy(myct->exp);