From patchwork Fri Oct 12 10:54:09 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Phil Sutter X-Patchwork-Id: 982984 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 42Wl8G4Djmz9s2P for ; Fri, 12 Oct 2018 21:54:22 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728003AbeJLS0M (ORCPT ); Fri, 12 Oct 2018 14:26:12 -0400 Received: from orbyte.nwl.cc ([151.80.46.58]:43100 "EHLO orbyte.nwl.cc" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727787AbeJLS0M (ORCPT ); Fri, 12 Oct 2018 14:26:12 -0400 Received: from localhost ([::1]:50634 helo=tatos) by orbyte.nwl.cc with esmtp (Exim 4.91) (envelope-from ) id 1gAv5H-0008Ju-Jm; Fri, 12 Oct 2018 12:54:19 +0200 From: Phil Sutter To: Pablo Neira Ayuso Cc: netfilter-devel@vger.kernel.org Subject: [nft PATCH] Fix memleak in netlink_parse_fwd() error path Date: Fri, 12 Oct 2018 12:54:09 +0200 Message-Id: <20181012105409.8204-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 Make sure allocated 'stmt' is freed before returning to caller. Fixes: 30d45266bf38b ("expr: extend fwd statement to support address and family") Signed-off-by: Phil Sutter --- src/netlink_delinearize.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/src/netlink_delinearize.c b/src/netlink_delinearize.c index 0a6ebe05ca7ca..cd058850f4df0 100644 --- a/src/netlink_delinearize.c +++ b/src/netlink_delinearize.c @@ -1227,9 +1227,11 @@ static void netlink_parse_fwd(struct netlink_parse_ctx *ctx, reg2 = netlink_parse_register(nle, NFTNL_EXPR_FWD_SREG_ADDR); if (reg2) { addr = netlink_get_register(ctx, loc, reg2); - if (addr == NULL) - return netlink_error(ctx, loc, - "fwd statement has no output expression"); + if (addr == NULL) { + netlink_error(ctx, loc, + "fwd statement has no output expression"); + goto out_err; + } switch (stmt->fwd.family) { case AF_INET: @@ -1241,8 +1243,9 @@ static void netlink_parse_fwd(struct netlink_parse_ctx *ctx, BYTEORDER_BIG_ENDIAN); break; default: - return netlink_error(ctx, loc, - "fwd statement has no family"); + netlink_error(ctx, loc, + "fwd statement has no family"); + goto out_err; } stmt->fwd.addr = addr; }