diff options
author | Jan Engelhardt <jengelh@medozas.de> | 2011-01-06 22:15:05 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-01-09 19:25:03 -0500 |
commit | 0ab03c2b1478f2438d2c80204f7fef65b1bca9cf (patch) | |
tree | a130abc7a3cc2d5c326b1bbdad80c06e741db3fd /net/xfrm | |
parent | dba5a68ae147d0672d4b9259f3ece37777f8b2fa (diff) |
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/xfrm')
-rw-r--r-- | net/xfrm/xfrm_user.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/xfrm/xfrm_user.c b/net/xfrm/xfrm_user.c index 8eb889510916..6a8da81ff66f 100644 --- a/net/xfrm/xfrm_user.c +++ b/net/xfrm/xfrm_user.c | |||
@@ -2187,7 +2187,7 @@ static int xfrm_user_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh) | |||
2187 | 2187 | ||
2188 | if ((type == (XFRM_MSG_GETSA - XFRM_MSG_BASE) || | 2188 | if ((type == (XFRM_MSG_GETSA - XFRM_MSG_BASE) || |
2189 | type == (XFRM_MSG_GETPOLICY - XFRM_MSG_BASE)) && | 2189 | type == (XFRM_MSG_GETPOLICY - XFRM_MSG_BASE)) && |
2190 | (nlh->nlmsg_flags & NLM_F_DUMP)) { | 2190 | (nlh->nlmsg_flags & NLM_F_DUMP) == NLM_F_DUMP) { |
2191 | if (link->dump == NULL) | 2191 | if (link->dump == NULL) |
2192 | return -EINVAL; | 2192 | return -EINVAL; |
2193 | 2193 | ||