summaryrefslogtreecommitdiff
path: root/net/netlink
diff options
context:
space:
mode:
authorThomas Graf <tgraf@suug.ch>2007-03-22 23:29:10 -0700
committerDavid S. Miller <davem@sunset.davemloft.net>2007-04-25 22:27:29 -0700
commit45e7ae7f716086994e4e747226881f901c67b031 (patch)
tree8f61cb9e3f67ac433e915176c2bf233d8899691d /net/netlink
parentd35b685640aeb39eb4f5e98c75e8e001e406f9a3 (diff)
[NETLINK]: Ignore control messages directly in netlink_run_queue()
Changes netlink_rcv_skb() to skip netlink controll messages and don't pass them on to the message handler. Signed-off-by: Thomas Graf <tgraf@suug.ch> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/netlink')
-rw-r--r--net/netlink/af_netlink.c4
-rw-r--r--net/netlink/genetlink.c6
2 files changed, 4 insertions, 6 deletions
diff --git a/net/netlink/af_netlink.c b/net/netlink/af_netlink.c
index 7b455980e9bf..5d1079b1838c 100644
--- a/net/netlink/af_netlink.c
+++ b/net/netlink/af_netlink.c
@@ -1479,6 +1479,10 @@ static int netlink_rcv_skb(struct sk_buff *skb, int (*cb)(struct sk_buff *,
if (!(nlh->nlmsg_flags & NLM_F_REQUEST))
goto skip;
+ /* Skip control messages */
+ if (nlh->nlmsg_type < NLMSG_MIN_TYPE)
+ goto skip;
+
if (cb(skb, nlh, &err) < 0) {
/* Not an error, but we have to interrupt processing
* here. Note: that in this case we do not pull
diff --git a/net/netlink/genetlink.c b/net/netlink/genetlink.c
index 039516f6cd80..95391e609046 100644
--- a/net/netlink/genetlink.c
+++ b/net/netlink/genetlink.c
@@ -304,9 +304,6 @@ static int genl_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh,
struct genlmsghdr *hdr = nlmsg_data(nlh);
int hdrlen, err = -EINVAL;
- if (nlh->nlmsg_type < NLMSG_MIN_TYPE)
- goto ignore;
-
family = genl_family_find_byid(nlh->nlmsg_type);
if (family == NULL) {
err = -ENOENT;
@@ -364,9 +361,6 @@ static int genl_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh,
*errp = err = ops->doit(skb, &info);
return err;
-ignore:
- return 0;
-
errout:
*errp = err;
return -1;