projects
/
platform
/
upstream
/
kernel-adaptation-pc.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
99fa5f5
)
[NETFILTER]: nf_conntrack_netlink: fix unbalanced locking
author
Patrick McHardy
<kaber@trash.net>
Thu, 31 Jan 2008 12:35:57 +0000
(
04:35
-0800)
committer
David S. Miller
<davem@davemloft.net>
Fri, 1 Feb 2008 03:27:50 +0000
(19:27 -0800)
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>
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
38141f1
..
bdae292
100644
(file)
--- 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) {