From 893fe3a6f5365e981f88783690f1c3fd6e98abbf Mon Sep 17 00:00:00 2001 From: Tomasz Bursztyka Date: Thu, 28 Jun 2012 02:57:49 +0000 Subject: [PATCH] --- yaml --- r: 311631 b: refs/heads/master c: 4009e18851ea555959c6017d848983b3d60bf667 h: refs/heads/master i: 311629: e9ed40ca688689099929be09783eb2e31be1e936 311627: 4b4a258b9a34941ecffb0557735a740fbfc3c816 311623: 69262a214906e49e8b30621a5122985693e5c365 311615: bb74b3c2efebcf640b4b0a362d932dbd36b9bbbf v: v3 --- [refs] | 2 +- trunk/net/netfilter/nfnetlink.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 054cfb0ad8e6..e4f73fe56aaa 100644 --- 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 index 3e797d1fcb94..791d56bbd74a 100644 --- 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,