]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
netfilter: ctnetlink: fix leak in error path of ctnetlink_create_expect
authorJesper Juhl <jj@chaosbits.net>
Wed, 26 Dec 2012 11:49:40 +0000 (11:49 +0000)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 4 Feb 2013 00:27:08 +0000 (18:27 -0600)
commit 1310b955c804975651dca6c674ebfd1cb2b4c7ff upstream.

This patch fixes a leak in one of the error paths of
ctnetlink_create_expect if no helper and no timeout is specified.

Signed-off-by: Jesper Juhl <jj@chaosbits.net>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
net/netfilter/nf_conntrack_netlink.c

index 7bbfb3deea305e4d8434c3af9a68ee6e4531c80f..ef9e86ecb77359a93e70eba05e01abe99ca1fc3a 100644 (file)
@@ -2514,7 +2514,7 @@ ctnetlink_create_expect(struct net *net, u16 zone,
        if (!help) {
                if (!cda[CTA_EXPECT_TIMEOUT]) {
                        err = -EINVAL;
-                       goto out;
+                       goto err_out;
                }
                exp->timeout.expires =
                  jiffies + ntohl(nla_get_be32(cda[CTA_EXPECT_TIMEOUT])) * HZ;