diff options
| author | David S. Miller <davem@davemloft.net> | 2012-07-07 16:18:50 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-07-07 16:18:50 -0700 |
| commit | d3a5ea6e2188adeea028c410c83c90e6b6d9347c (patch) | |
| tree | 7035d790158da6fad3c482afa545b3dba2e6b037 /net/netfilter/nfnetlink.c | |
| parent | 8ce5c9f27d2e2ce415d903d916e848a356d4c0c0 (diff) | |
| parent | 46ba5a25f521e3c50d7bb81b1abb977769047456 (diff) | |
| download | linux-d3a5ea6e2188adeea028c410c83c90e6b6d9347c.tar.gz | |
Merge branch 'master' of git://1984.lsi.us.es/nf-next
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 465539d43a0a15..a26503342e7184 100644 --- a/net/netfilter/nfnetlink.c +++ b/net/netfilter/nfnetlink.c @@ -195,9 +195,11 @@ replay: lockdep_is_held(&nfnl_mutex)) != ss || nfnetlink_find_client(type, ss) != nc) err = -EAGAIN; - else + else if (nc->call) err = nc->call(net->nfnl, skb, nlh, (const struct nlattr **)cda); + else + err = -EINVAL; nfnl_unlock(); } if (err == -EAGAIN) |