Received: by 2002:ac0:a5b6:0:0:0:0:0 with SMTP id m51-v6csp2341432imm; Mon, 28 May 2018 06:22:54 -0700 (PDT) X-Google-Smtp-Source: AB8JxZrVCBnxpf4V+n5slCGhsG4dGHlAhbmLX9netjpq3oF9aZic6ZOsd79W99sdoJk/5wCcv8/u X-Received: by 2002:a65:4e03:: with SMTP id r3-v6mr10830218pgt.121.1527513774069; Mon, 28 May 2018 06:22:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1527513774; cv=none; d=google.com; s=arc-20160816; b=lsP/7OXzLlsLWaPdraFy0cp6nGG+3pyoiEGHqVtfUgdFTDdR9SrVPqgWRhSTdYHUsV MxJT7ZB/HiE5FX919XnNRg3fym3DLheI/wrVQdTZQIYBwQF+FNbKYxbOYIfptKRc7DPX mmkNtrGtle1/+75hyWExkxjv7xNqHZfnhSprYNKSJoY9dpjPMcStvH8YBZK6LLpkV5W/ hMJgTo86gQdvEbgUtB5Bd3CXIv6jJK84/l+K73DNEd9aEHstFCZ3+3EuMau1UH75u5TV tUbzhhy4WnrWNImeCnwRl6HbatbREMUvZ4ABFM1cfuSSbpHd0H0XHSLDkyDw7Bi8EUNW PUNQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:user-agent:references :in-reply-to:message-id:date:subject:cc:to:from:dkim-signature :arc-authentication-results; bh=D0U8ewXF2D4KPQkqly7eeqJdXp9Y3OgoL4lZGLkZ9yw=; b=P/F5Lm8mwJ3WC59Z+H8ZBVRlHEPXZSYINEACi7tpxsnMSLeejiR4OVHWtxXkOkyQ50 cX5JJR0Mc6M6951VKIwQW5lVY5qyplo6r0FORf/P3aDGsK1CDsoajz0tX1NJu8Lh8TuW x7f1nQSuxnGhFrwrMOpdFn7vHv9fGtDA71pXw9BSDFJcjypPXiGEKhJFpaq639pmk6Re Vm7jMt2RNgpRvP5tZf92dvuS/wLVEmZpeYesK6mxnQ8PH/aG8Fss2OvbAgQyGq54u3yv fp50OPjZxPUO4LvjT8xZPhdMB975z3CNfAPeVWnNuK7ck6vAXlQol7vCSF/EDTYdzXlp g4FA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=opfyJdcj; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 89-v6si30458344pfs.362.2018.05.28.06.22.39; Mon, 28 May 2018 06:22:54 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=opfyJdcj; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1165333AbeE1NVt (ORCPT + 99 others); Mon, 28 May 2018 09:21:49 -0400 Received: from mail.kernel.org ([198.145.29.99]:38828 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1163454AbeE1KtD (ORCPT ); Mon, 28 May 2018 06:49:03 -0400 Received: from localhost (LFbn-1-12247-202.w90-92.abo.wanadoo.fr [90.92.61.202]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 3B921204EE; Mon, 28 May 2018 10:49:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1527504542; bh=v9ciu+JMA58hw2sGKJ1NzaML/u0Dj5K5pNH6slWzn2g=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=opfyJdcjJR2cfBexrxiSjPsdtOj/FfG27172lbgDcifBC5Gyt/E7co1v7nMgWYete Ac3mGjEZSoyRSzSkn5qZvyphfwEpmEp6MS39MNk0HhpD6HEC/d3bo8sucbG13Qk1gF lh/I7V28KcjsfVEVmsvtrsz5upyIUu4pcfHah3+0= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Florian Westphal , Pablo Neira Ayuso , Sasha Levin Subject: [PATCH 4.14 144/496] netfilter: ipt_CLUSTERIP: put config struct if we cant increment ct refcount Date: Mon, 28 May 2018 11:58:49 +0200 Message-Id: <20180528100325.980698105@linuxfoundation.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180528100319.498712256@linuxfoundation.org> References: <20180528100319.498712256@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.14-stable review patch. If anyone has any objections, please let me know. ------------------ From: Florian Westphal [ Upstream commit 8ae56822812ddedc26a152ab1916eb30120b4748 ] This needs to put() the entry to avoid a resource leak in error path. Signed-off-by: Florian Westphal Signed-off-by: Pablo Neira Ayuso Signed-off-by: Sasha Levin Signed-off-by: Greg Kroah-Hartman --- net/ipv4/netfilter/ipt_CLUSTERIP.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) --- a/net/ipv4/netfilter/ipt_CLUSTERIP.c +++ b/net/ipv4/netfilter/ipt_CLUSTERIP.c @@ -492,12 +492,15 @@ static int clusterip_tg_check(const stru return PTR_ERR(config); } } - cipinfo->config = config; ret = nf_ct_netns_get(par->net, par->family); - if (ret < 0) + if (ret < 0) { pr_info("cannot load conntrack support for proto=%u\n", par->family); + clusterip_config_entry_put(par->net, config); + clusterip_config_put(config); + return ret; + } if (!par->net->xt.clusterip_deprecated_warning) { pr_info("ipt_CLUSTERIP is deprecated and it will removed soon, " @@ -505,6 +508,7 @@ static int clusterip_tg_check(const stru par->net->xt.clusterip_deprecated_warning = true; } + cipinfo->config = config; return ret; }