From patchwork Fri Oct 12 11:22:55 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Phil Sutter X-Patchwork-Id: 982990 X-Patchwork-Delegate: pablo@netfilter.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netfilter-devel-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=nwl.cc Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 42WlnS5FR6z9s3C for ; Fri, 12 Oct 2018 22:23:08 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727842AbeJLSzF (ORCPT ); Fri, 12 Oct 2018 14:55:05 -0400 Received: from orbyte.nwl.cc ([151.80.46.58]:43168 "EHLO orbyte.nwl.cc" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726568AbeJLSzF (ORCPT ); Fri, 12 Oct 2018 14:55:05 -0400 Received: from localhost ([::1]:50702 helo=tatos) by orbyte.nwl.cc with esmtp (Exim 4.91) (envelope-from ) id 1gAvX7-0000C4-Qb; Fri, 12 Oct 2018 13:23:05 +0200 From: Phil Sutter To: Pablo Neira Ayuso Cc: netfilter-devel@vger.kernel.org Subject: [nft PATCH] libnftables: Fix memleak in nft_parse_bison_filename() Date: Fri, 12 Oct 2018 13:22:55 +0200 Message-Id: <20181012112255.12807-1-phil@nwl.cc> X-Mailer: git-send-email 2.19.0 MIME-Version: 1.0 Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org Allocated scanner object leaks when returning to caller. For some odd reason, this was missed by the commit referenced below. Fixes: bd82e03e15df8 ("libnftables: Move scanner object into struct nft_ctx") Signed-off-by: Phil Sutter --- src/libnftables.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/libnftables.c b/src/libnftables.c index 547aa59bf978c..23a262ca46fe3 100644 --- a/src/libnftables.c +++ b/src/libnftables.c @@ -420,15 +420,14 @@ static int nft_parse_bison_filename(struct nft_ctx *nft, const char *filename, struct list_head *msgs, struct list_head *cmds) { struct cmd *cmd; - void *scanner; int ret; parser_init(nft, nft->state, msgs, cmds); - scanner = scanner_init(nft->state); - if (scanner_read_file(scanner, filename, &internal_location) < 0) + nft->scanner = scanner_init(nft->state); + if (scanner_read_file(nft->scanner, filename, &internal_location) < 0) return -1; - ret = nft_parse(nft, scanner, nft->state); + ret = nft_parse(nft, nft->scanner, nft->state); if (ret != 0 || nft->state->nerrs > 0) return -1;