diff options
author | Jan Engelhardt <jengelh@medozas.de> | 2011-01-07 03:15:05 +0000 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-01-09 16:25:03 -0800 |
commit | 0ab03c2b1478f2438d2c80204f7fef65b1bca9cf (patch) | |
tree | a130abc7a3cc2d5c326b1bbdad80c06e741db3fd /net/netfilter | |
parent | dba5a68ae147d0672d4b9259f3ece37777f8b2fa (diff) | |
download | kernel_samsung_crespo-0ab03c2b1478f2438d2c80204f7fef65b1bca9cf.zip kernel_samsung_crespo-0ab03c2b1478f2438d2c80204f7fef65b1bca9cf.tar.gz kernel_samsung_crespo-0ab03c2b1478f2438d2c80204f7fef65b1bca9cf.tar.bz2 |
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/netfilter')
-rw-r--r-- | net/netfilter/nf_conntrack_netlink.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/netfilter/nf_conntrack_netlink.c b/net/netfilter/nf_conntrack_netlink.c index 0cdba50..7461402 100644 --- a/net/netfilter/nf_conntrack_netlink.c +++ b/net/netfilter/nf_conntrack_netlink.c @@ -928,7 +928,7 @@ ctnetlink_get_conntrack(struct sock *ctnl, struct sk_buff *skb, u16 zone; int err; - if (nlh->nlmsg_flags & NLM_F_DUMP) + if ((nlh->nlmsg_flags & NLM_F_DUMP) == NLM_F_DUMP) return netlink_dump_start(ctnl, skb, nlh, ctnetlink_dump_table, ctnetlink_done); @@ -1790,7 +1790,7 @@ ctnetlink_get_expect(struct sock *ctnl, struct sk_buff *skb, u16 zone; int err; - if (nlh->nlmsg_flags & NLM_F_DUMP) { + if ((nlh->nlmsg_flags & NLM_F_DUMP) == NLM_F_DUMP) { return netlink_dump_start(ctnl, skb, nlh, ctnetlink_exp_dump_table, ctnetlink_exp_done); |