---

yaml --- r: 311631 b: refs/heads/master c: 4009e18 h: refs/heads/master i: 311629: e9ed40c 311627: 4b4a258 311623: 69262a2 311615: bb74b3c v: v3
git-mirror · Jun 29, 2012 · 893fe3a · 893fe3a
1 parent 1651e3b
commit 893fe3a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d31f4d448f7671dc3e6a7a1c92a4c085a36058bb
+refs/heads/master: 4009e18851ea555959c6017d848983b3d60bf667
diff --git a/trunk/net/netfilter/nfnetlink.c b/trunk/net/netfilter/nfnetlink.c
@@ -169,8 +169,10 @@ static int nfnetlink_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh)
 
 		err = nla_parse(cda, ss->cb[cb_id].attr_count,
 				attr, attrlen, ss->cb[cb_id].policy);
-		if (err < 0)
+		if (err < 0) {
+			rcu_read_unlock();
 			return err;
+		}
 
 		if (nc->call_rcu) {
 			err = nc->call_rcu(net->nfnl, skb, nlh,