From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.linuxfoundation.org ([140.211.169.12]:38744 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751380AbbJQTuG (ORCPT ); Sat, 17 Oct 2015 15:50:06 -0400 Subject: Patch "netfilter: ctnetlink: put back references to master ct and expect objects" has been added to the 3.14-stable tree To: pablo@netfilter.org, Tim.Wiess@watchguard.com, gregkh@linuxfoundation.org Cc: , From: Date: Sat, 17 Oct 2015 12:50:06 -0700 Message-ID: <144511140620731@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org List-ID: This is a note to let you know that I've just added the patch titled netfilter: ctnetlink: put back references to master ct and expect objects to the 3.14-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: netfilter-ctnetlink-put-back-references-to-master-ct-and-expect-objects.patch and it can be found in the queue-3.14 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let know about it. >>From 95dd8653de658143770cb0e55a58d2aab97c79d2 Mon Sep 17 00:00:00 2001 From: Pablo Neira Ayuso Date: Thu, 9 Jul 2015 22:56:00 +0200 Subject: netfilter: ctnetlink: put back references to master ct and expect objects From: Pablo Neira Ayuso commit 95dd8653de658143770cb0e55a58d2aab97c79d2 upstream. We have to put back the references to the master conntrack and the expectation that we just created, otherwise we'll leak them. Fixes: 0ef71ee1a5b9 ("netfilter: ctnetlink: refactor ctnetlink_create_expect") Reported-by: Tim Wiess Signed-off-by: Pablo Neira Ayuso Signed-off-by: Greg Kroah-Hartman --- net/netfilter/nf_conntrack_netlink.c | 5 ----- 1 file changed, 5 deletions(-) --- a/net/netfilter/nf_conntrack_netlink.c +++ b/net/netfilter/nf_conntrack_netlink.c @@ -2927,11 +2927,6 @@ ctnetlink_create_expect(struct net *net, } err = nf_ct_expect_related_report(exp, portid, report); - if (err < 0) - goto err_exp; - - return 0; -err_exp: nf_ct_expect_put(exp); err_ct: nf_ct_put(ct); Patches currently in stable-queue which might be from pablo@netfilter.org are queue-3.14/netfilter-nft_compat-skip-family-comparison-in-case-of-nfproto_unspec.patch queue-3.14/netfilter-nf_conntrack-support-expectations-in-different-zones.patch queue-3.14/netfilter-ctnetlink-put-back-references-to-master-ct-and-expect-objects.patch