diff options
author | Jesper Juhl <jj@chaosbits.net> | 2012-12-26 06:49:40 -0500 |
---|---|---|
committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2012-12-26 17:02:09 -0500 |
commit | 1310b955c804975651dca6c674ebfd1cb2b4c7ff (patch) | |
tree | e12e4e24230c5fb5eeb9c7c4fe6e150ea05307c0 | |
parent | 32263dd1b43378b4f7d7796ed713f77e95f27e8a (diff) |
netfilter: ctnetlink: fix leak in error path of ctnetlink_create_expect
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>
-rw-r--r-- | net/netfilter/nf_conntrack_netlink.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/netfilter/nf_conntrack_netlink.c b/net/netfilter/nf_conntrack_netlink.c index 4e078cd84d8..627b0e50b23 100644 --- a/net/netfilter/nf_conntrack_netlink.c +++ b/net/netfilter/nf_conntrack_netlink.c | |||
@@ -2624,7 +2624,7 @@ ctnetlink_create_expect(struct net *net, u16 zone, | |||
2624 | if (!help) { | 2624 | if (!help) { |
2625 | if (!cda[CTA_EXPECT_TIMEOUT]) { | 2625 | if (!cda[CTA_EXPECT_TIMEOUT]) { |
2626 | err = -EINVAL; | 2626 | err = -EINVAL; |
2627 | goto out; | 2627 | goto err_out; |
2628 | } | 2628 | } |
2629 | exp->timeout.expires = | 2629 | exp->timeout.expires = |
2630 | jiffies + ntohl(nla_get_be32(cda[CTA_EXPECT_TIMEOUT])) * HZ; | 2630 | jiffies + ntohl(nla_get_be32(cda[CTA_EXPECT_TIMEOUT])) * HZ; |