diff options
| author | David S. Miller <davem@davemloft.net> | 2012-07-05 03:44:25 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-07-05 03:44:25 -0700 |
| commit | c90a9bb9073a4096596360f02ea711c619663494 (patch) | |
| tree | dc85d9f4c0d423e6b523e81c41a5b68e267de14f /net/netfilter/nfnetlink.c | |
| parent | 23c342153ef2a4ad8bd4f2d6515126449658d2b3 (diff) | |
| parent | 9e85a6f9dc231f3ed3c1dc1b12217505d970142a (diff) | |
| download | blackbird-op-linux-c90a9bb9073a4096596360f02ea711c619663494.tar.gz blackbird-op-linux-c90a9bb9073a4096596360f02ea711c619663494.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'net/netfilter/nfnetlink.c')
| -rw-r--r-- | net/netfilter/nfnetlink.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/net/netfilter/nfnetlink.c b/net/netfilter/nfnetlink.c index 5a2132b97fe9..465539d43a0a 100644 --- a/net/netfilter/nfnetlink.c +++ b/net/netfilter/nfnetlink.c @@ -178,8 +178,10 @@ replay: 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, |
