From e2f6a5aa07a9d68e64dd0665ef4e83d026d0c443 Mon Sep 17 00:00:00 2001 From: Tomasz Bursztyka Date: Thu, 28 Jun 2012 02:57:47 +0000 Subject: [PATCH] --- yaml --- r: 315020 b: refs/heads/master c: 59560a38a379b6c9048620ee10711d3c0c5974b3 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/netfilter/nfnetlink.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 3353845dc88e..5c39f9dccab9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: be0593c678249cbb32c6096a705f05a9834e257d +refs/heads/master: 59560a38a379b6c9048620ee10711d3c0c5974b3 diff --git a/trunk/net/netfilter/nfnetlink.c b/trunk/net/netfilter/nfnetlink.c index 3e797d1fcb94..4acdd76bb6c4 100644 --- a/trunk/net/netfilter/nfnetlink.c +++ b/trunk/net/netfilter/nfnetlink.c @@ -184,9 +184,11 @@ static int nfnetlink_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh) 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)