diff options
author | Patrick McHardy | 2008-01-31 13:35:57 +0100 |
---|---|---|
committer | David S. Miller | 2008-02-01 04:27:50 +0100 |
commit | 1d670fdc8c14780b8e0ad915ad3bb13b2fd9223b (patch) | |
tree | 38e9859d29174b271c66a65fab6c05f55e407a9a /net/netfilter/nf_conntrack_netlink.c | |
parent | [NETFILTER]: nf_conntrack_ipv6: fix sparse warnings (diff) | |
download | kernel-qcow2-linux-1d670fdc8c14780b8e0ad915ad3bb13b2fd9223b.tar.gz kernel-qcow2-linux-1d670fdc8c14780b8e0ad915ad3bb13b2fd9223b.tar.xz kernel-qcow2-linux-1d670fdc8c14780b8e0ad915ad3bb13b2fd9223b.zip |
[NETFILTER]: nf_conntrack_netlink: fix unbalanced locking
Properly drop nf_conntrack_lock on tuple parsing error.
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/netfilter/nf_conntrack_netlink.c')
-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 38141f104db7..bdae2924d425 100644 --- a/net/netfilter/nf_conntrack_netlink.c +++ b/net/netfilter/nf_conntrack_netlink.c @@ -1237,7 +1237,7 @@ ctnetlink_new_conntrack(struct sock *ctnl, struct sk_buff *skb, CTA_TUPLE_MASTER, u3); if (err < 0) - return err; + goto out_unlock; master_h = __nf_conntrack_find(&master, NULL); if (master_h == NULL) { |