| From 1310b955c804975651dca6c674ebfd1cb2b4c7ff Mon Sep 17 00:00:00 2001 |
| From: Jesper Juhl <jj@chaosbits.net> |
| Date: Wed, 26 Dec 2012 11:49:40 +0000 |
| Subject: netfilter: ctnetlink: fix leak in error path of ctnetlink_create_expect |
| |
| From: Jesper Juhl <jj@chaosbits.net> |
| |
| 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 | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| --- a/net/netfilter/nf_conntrack_netlink.c |
| +++ b/net/netfilter/nf_conntrack_netlink.c |
| @@ -2514,7 +2514,7 @@ ctnetlink_create_expect(struct net *net, |
| 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; |
