projects
/
kernel
/
kernel-generic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
32263dd
)
netfilter: ctnetlink: fix leak in error path of ctnetlink_create_expect
author
Jesper Juhl
<jj@chaosbits.net>
Wed, 26 Dec 2012 11:49:40 +0000
(11:49 +0000)
committer
Pablo Neira Ayuso
<pablo@netfilter.org>
Wed, 26 Dec 2012 22:02:09 +0000
(23:02 +0100)
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>
net/netfilter/nf_conntrack_netlink.c
patch
|
blob
|
history
diff --git
a/net/netfilter/nf_conntrack_netlink.c
b/net/netfilter/nf_conntrack_netlink.c
index
4e078cd
..
627b0e5
100644
(file)
--- 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,
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;