[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <20110118172340.GB1843@del.dom.local>
Date: Tue, 18 Jan 2011 18:23:40 +0100
From: Jarek Poplawski <jarkao2@...il.com>
To: jamal <hadi@...erus.ca>
Cc: David Miller <davem@...emloft.net>, pablo@...filter.org,
arthur.marsh@...ernode.on.net, jengelh@...ozas.de,
eric.dumazet@...il.com, netdev@...r.kernel.org,
Alessandro Suardi <alessandro.suardi@...il.com>
Subject: Re: inbound connection problems when "netlink: test for all flags
of the NLM_F_DUMP composite" commit applied
[PATCH] netlink: Fix possible NLM_F_DUMP misuse in genetlink
NLM_F_DUMP flags should be applied to GET requests only, eg. rtnetlink
tests message type to verify this. Since genetlink can't do the same
use "practical" test for ops->dumpit (assuming NEW request won't be
mixed with GET).
Signed-off-by: Jarek Poplawski <jarkao2@...il.com>
Cc: Jan Engelhardt <jengelh@...ozas.de>
Cc: Pablo Neira Ayuso <pablo@...filter.org>
Cc: Jamal Hadi Salim <hadi@...erus.ca>
---
Not for stable before testing!
diff -Nurp a/net/netlink/genetlink.c b/net/netlink/genetlink.c
--- a/net/netlink/genetlink.c 2011-01-18 16:58:16.000000000 +0100
+++ b/net/netlink/genetlink.c 2011-01-18 17:08:43.000000000 +0100
@@ -519,15 +519,16 @@ static int genl_rcv_msg(struct sk_buff *
security_netlink_recv(skb, CAP_NET_ADMIN))
return -EPERM;
- if (nlh->nlmsg_flags & NLM_F_DUMP) {
- if (ops->dumpit == NULL)
+ if (ops->dumpit) {
+ if (nlh->nlmsg_flags & NLM_F_DUMP) {
+ genl_unlock();
+ err = netlink_dump_start(net->genl_sock, skb, nlh,
+ ops->dumpit, ops->done);
+ genl_lock();
+ return err;
+ } else {
return -EOPNOTSUPP;
-
- genl_unlock();
- err = netlink_dump_start(net->genl_sock, skb, nlh,
- ops->dumpit, ops->done);
- genl_lock();
- return err;
+ }
}
if (ops->doit == NULL)
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists