summaryrefslogtreecommitdiff
path: root/net/netlink
diff options
context:
space:
mode:
authorJan Engelhardt <jengelh@medozas.de>2011-01-07 06:15:05 +0300
committerDavid S. Miller <davem@davemloft.net>2011-01-10 03:25:03 +0300
commit0ab03c2b1478f2438d2c80204f7fef65b1bca9cf (patch)
treea130abc7a3cc2d5c326b1bbdad80c06e741db3fd /net/netlink
parentdba5a68ae147d0672d4b9259f3ece37777f8b2fa (diff)
downloadlinux-0ab03c2b1478f2438d2c80204f7fef65b1bca9cf.tar.xz
netlink: test for all flags of the NLM_F_DUMP composite
Due to NLM_F_DUMP is composed of two bits, NLM_F_ROOT | NLM_F_MATCH, when doing "if (x & NLM_F_DUMP)", it tests for _either_ of the bits being set. Because NLM_F_MATCH's value overlaps with NLM_F_EXCL, non-dump requests with NLM_F_EXCL set are mistaken as dump requests. Substitute the condition to test for _all_ bits being set. Signed-off-by: Jan Engelhardt <jengelh@medozas.de> Acked-by: Pablo Neira Ayuso <pablo@netfilter.org> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/netlink')
-rw-r--r--net/netlink/genetlink.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/netlink/genetlink.c b/net/netlink/genetlink.c
index 1781d99145e2..f83cb370292b 100644
--- a/net/netlink/genetlink.c
+++ b/net/netlink/genetlink.c
@@ -519,7 +519,7 @@ static int genl_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh)
security_netlink_recv(skb, CAP_NET_ADMIN))
return -EPERM;
- if (nlh->nlmsg_flags & NLM_F_DUMP) {
+ if ((nlh->nlmsg_flags & NLM_F_DUMP) == NLM_F_DUMP) {
if (ops->dumpit == NULL)
return -EOPNOTSUPP;